Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v7-stable' | Rainer Gerhards | 2012-12-13 | 1 | -21/+6 |
|\ | |||||
| * | build: link omelasticsearch against -lm | Michael Biebl | 2012-12-13 | 1 | -0/+1 |
| | | | | | | | | Use LT_LIB_M to find the math library which is needed for pow(). | ||||
| * | build: drop obsolete --enable-pthreads configure switch | Michael Biebl | 2012-12-13 | 1 | -18/+2 |
| | | | | | | | | Building without pthreads support hasn't been support for a while. | ||||
| * | build: fix uuid configure check | Michael Biebl | 2012-12-13 | 1 | -3/+3 |
| | | |||||
| * | prepare for 7.2.4v7.2.4 | Rainer Gerhards | 2012-12-07 | 1 | -1/+1 |
| | | |||||
| * | prepare for 7.2.3 releasev7.2.3 | Rainer Gerhards | 2012-11-21 | 1 | -1/+1 |
| | | |||||
| * | prepare 7.2.2 releasev7.2.2 | Rainer Gerhards | 2012-11-16 | 1 | -1/+1 |
| | | |||||
* | | prepare 7.3.4 releasev7.3.4 | Rainer Gerhards | 2012-11-25 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-11-14 | 1 | -1/+1 |
|\| | |||||
| * | bugfix: make rsyslog compile on kfreebsd again | Guillem Jover | 2012-11-14 | 1 | -1/+1 |
| | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=380 | ||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-11-09 | 1 | -22/+18 |
|\| | |||||
| * | cleanup: remove no longer needed configure setting | Rainer Gerhards | 2012-11-09 | 1 | -21/+0 |
| | | |||||
| * | enabled to build without libuuid, at loss of uuid functionality | Rainer Gerhards | 2012-11-09 | 1 | -1/+18 |
| | | | | | | | | | | | | this enables smoother builds on older systems that do not support libuuid. Loss of functionality should usually not matter too much as uuid support has only recently been added and is very seldom used. | ||||
| * | prepare for 7.2.1 releasev7.2.1 | Rainer Gerhards | 2012-10-29 | 1 | -1/+1 |
| | | |||||
| * | prepare for 7.20 stable release & minor thingsv7.2.0 | Rainer Gerhards | 2012-10-22 | 1 | -1/+1 |
| | | | | | | | | | | | | The most important real code chane is the initialization of the epoll control set. This should just be cosmetic (valgrind warnings), as all data we actually use already was properly initialized. | ||||
* | | prepare for 7.3.3 releasev7.3.3 | Rainer Gerhards | 2012-11-07 | 1 | -1/+1 |
| | | |||||
* | | prepare for 7.3.2 releasev7.3.2 | Rainer Gerhards | 2012-10-30 | 1 | -1/+1 |
| | | |||||
* | | move cJSON to omelasticsearch | Rainer Gerhards | 2012-10-29 | 1 | -1/+1 |
| | | | | | | | | | | | | the rsyslog runtime itself now uses json-c, but omelasticsearch currently depends on cJSON. We will change this, but not yet. Let's merge as is and see that it works well ;) | ||||
* | | Merge branch 'beta-jsonrt' into master-es | Rainer Gerhards | 2012-10-29 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/rsyslog.h | ||||
| * | | omelasticsearch: parse JSON response (in regard to data errors) | Rainer Gerhards | 2012-07-25 | 1 | -1/+1 |
| | | | | | | | | | | | | note: bulkmode response processing is still mostly missing | ||||
* | | | prepare for 7.3.1 releasev7.3.1 | Rainer Gerhards | 2012-10-19 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-18 | 1 | -58/+2 |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | preparing for 7.1.12 releasev7.1.12 | Rainer Gerhards | 2012-10-18 | 1 | -1/+1 |
| | | | |||||
| * | | build: Remove vestiges of the cust1 plugin | Michael Biebl | 2012-10-18 | 1 | -1/+0 |
| | | | |||||
| * | | build: Drop unused CNF_LIBS variable | Michael Biebl | 2012-10-18 | 1 | -1/+0 |
| | | | |||||
| * | | build: Use pkg-config to check for libcurl | Michael Biebl | 2012-10-18 | 1 | -19/+1 |
| | | | | | | | | | | | | curl has shipped that file since 2004. | ||||
| * | | build: Use pkg-config to check for libuuid | Michael Biebl | 2012-10-18 | 1 | -16/+1 |
| | | | | | | | | | | | | | | | e2fsprogs resp. util-linux(-ng) have shipped that file since at least 2009. | ||||
| * | | build: Don't call AC_SUBST for variables defined by PKG_CHECK_MODULES | Michael Biebl | 2012-10-18 | 1 | -21/+0 |
| | | | | | | | | | | | | | | | | | | | | | Newer versions of pkg-config do that already. According to pkg-config upstream this change was made around 2005, so it should be rather safe. This change doesn't affect users building from dist tarballs anyway but only if you are building from a Git checkout. | ||||
| * | | prepare for version 7.1.11v7.1.11 | Rainer Gerhards | 2012-10-16 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-11 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | make omruleset non-default in ./configure | Rainer Gerhards | 2012-10-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | as this module's functionality has been superseeded by the "call" statement. Thanks to Michael Biebl for alerting me on the still-old default. | ||||
| * | | preparing for 7.1.10 releasev7.1.10 | Rainer Gerhards | 2012-10-11 | 1 | -1/+1 |
| | | | |||||
| * | | prepare for 7.1.9 releasev7.1.9 | Rainer Gerhards | 2012-10-09 | 1 | -1/+1 |
| | | | |||||
* | | | preparing for 7.3.0 releasev7.3.0 | Rainer Gerhards | 2012-10-08 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-04 | 1 | -16/+0 |
|\ \ | | | | | | | | | | | | | Conflicts: plugins/cust1/Makefile.am | ||||
| * \ | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-04 | 1 | -17/+0 |
| |\ \ | |||||
| | * | | remove cust1 dummy plugin from build system | Rainer Gerhards | 2012-10-04 | 1 | -17/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Michael Biebl for identifying this as the culprit for several build-related issues. The plugin is a placeholder, and was not used for quite some while. It is definitely not worth the effort to keep it along. If needed, can be quickly created. | ||||
| | * | | preparing for 5.10.0 releasev5.10.0 | Rainer Gerhards | 2012-08-22 | 1 | -1/+1 |
| | | | | |||||
| | * | | preparing for 5.9.7v5.9.7 | Rainer Gerhards | 2012-05-10 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-05-03 | 1 | -0/+16 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | | | preparing for 6.4.2 releasev6.4.2 | Rainer Gerhards | 2012-09-20 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | preparing for 6.4.1 releasev6.4.1 | Rainer Gerhards | 2012-09-06 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | preparing for 6.4.0 release | Rainer Gerhards | 2012-08-20 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
| * | | | preparing for 6.3.12v6.3.12 | Rainer Gerhards | 2012-07-02 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'v6-stable' into beta | Andre Lorbach | 2012-06-28 | 1 | -1/+1 |
| |\ \ \ | |||||
* | | | | | prepare for 7.1.8 releasev7.1.8 | Rainer Gerhards | 2012-10-02 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-10-02 | 1 | -0/+13 |
|\ \ \ \ \ | |||||
| * | | | | | integrate logctl into build process | Rainer Gerhards | 2012-10-02 | 1 | -0/+13 |
| | | | | | | |||||
* | | | | | | preparing for 7.1.7 releasev7.1.7 | Rainer Gerhards | 2012-10-01 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | preparing for 7.1.6 releasev7.1.6 | Rainer Gerhards | 2012-09-28 | 1 | -1/+1 |
| | | | | | |