Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslog | Rainer Gerhards | 2012-02-08 | 2 | -31/+28 |
|\ | |||||
| * | dns chache: added some more error instrumentation | Rainer Gerhards | 2012-02-06 | 2 | -31/+28 |
| | | |||||
* | | omsnmp: support for new config system added & some refactoring | Rainer Gerhards | 2012-02-08 | 2 | -100/+146 |
|/ | |||||
* | Merge branch 'v6-stable' | Rainer Gerhards | 2012-02-03 | 1 | -16/+14 |
|\ | |||||
| * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-02-03 | 1 | -16/+14 |
| |\ | |||||
| | * | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-02-03 | 1 | -16/+14 |
| | |\ | |||||
| | | * | ommysql: put under ASL 2.0 | Rainer Gerhards | 2012-02-03 | 1 | -16/+14 |
| | | | | | | | | | | | | | | | | after getting OK via email from contributor Ariel P. (2012-02-02 22:06 CET) | ||||
* | | | | upgraded omlibdbi to support the new v6 config format | Rainer Gerhards | 2012-02-02 | 3 | -24/+119 |
| | | | | |||||
* | | | | ommysql: updated doc | Rainer Gerhards | 2012-02-02 | 1 | -16/+30 |
| | | | | |||||
* | | | | bugfix: abort during startup when rsyslog.conf v6+ format was used in a ↵ | Rainer Gerhards | 2012-02-02 | 5 | -6/+13 |
| | | | | | | | | | | | | | | | | certain way | ||||
* | | | | ommysql: added support for v6 config format | Rainer Gerhards | 2012-02-02 | 3 | -0/+118 |
| | | | | |||||
* | | | | nit: release date for 6.3.7v6.3.7 | Rainer Gerhards | 2012-02-02 | 1 | -1/+1 |
| | | | | |||||
* | | | | cleanup: remove code for no-longer needed legacy conf functionality | Rainer Gerhards | 2012-02-01 | 3 | -8/+5 |
| | | | | |||||
* | | | | conf file: bufgix: legacy parsing of some filters did not work correctly | Rainer Gerhards | 2012-02-01 | 4 | -6/+6 |
| | | | | |||||
* | | | | omsnmp: fixing compile problem | Rainer Gerhards | 2012-02-01 | 2 | -4/+3 |
| | | | | |||||
* | | | | omgssapi: fix compile errors | Rainer Gerhards | 2012-02-01 | 1 | -9/+2 |
| | | | | |||||
* | | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-02-01 | 1 | -4/+4 |
|\| | | | |||||
| * | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-02-01 | 0 | -0/+0 |
| |\| | | |||||
| | * | | undoing last commit: wrong branch | Rainer Gerhards | 2012-01-30 | 1 | -1/+1 |
| | | | | |||||
| | * | | indicated special version | Rainer Gerhards | 2012-01-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | omgssapi: made recompile again | Rainer Gerhards | 2012-02-01 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | but this version seems to have a problem, a fix as part of a rewrite is underway. Just wanted to keep things in the same state as before the interface change. | ||||
* | | | | preparing for 6.3.7 | Rainer Gerhards | 2012-01-31 | 3 | -44/+35 |
| | | | | |||||
* | | | | bugfix: rsyslog aborted during startup if there is an error in loading an action | Rainer Gerhards | 2012-01-27 | 4 | -24/+20 |
| | | | | | | | | | | | | | | | | and legacy configuration mode is used | ||||
* | | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-01-27 | 6 | -47/+62 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imklog/imklog.c plugins/imklog/imklog.h runtime/conf.c runtime/rsyslog.h | ||||
| * | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-01-27 | 8 | -48/+69 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/omprog/omprog.c runtime/rsyslog.h | ||||
| | * | | added merged v4 bugfix info to changelog | Rainer Gerhards | 2012-01-27 | 1 | -0/+4 |
| | | | | |||||
| | * | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-27 | 7 | -47/+59 |
| | |\| | |||||
| | | * | bugfix: omprog made rsyslog abort on startup if not binary to execute was ↵ | Rainer Gerhards | 2012-01-27 | 3 | -0/+9 |
| | | | | | | | | | | | | | | | | configured | ||||
| | | * | relicense unlimited_select.h under ASL 2.0 | Rainer Gerhards | 2012-01-26 | 1 | -15/+14 |
| | | | | | | | | | | | | | | | | | | | | after receiving permission from Red Hat legal (given in email from Tomas Heinrich) | ||||
| | | * | increased max config file line size to 64k | Rainer Gerhards | 2012-01-24 | 2 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | We now also emit an error message if even 64k is not enough (not doing so previously may rightfully be considered as a bug) | ||||
| | | * | licensing change | Rainer Gerhards | 2012-01-21 | 2 | -31/+29 |
| | | | | |||||
| * | | | mentioning license change in ChangeLog | Rainer Gerhards | 2012-01-21 | 1 | -0/+1 |
| | | | | |||||
* | | | | omprog: added support for v6 config system | Rainer Gerhards | 2012-01-27 | 2 | -1/+67 |
| | | | | |||||
* | | | | cleanup: remove omdbalerting | Rainer Gerhards | 2012-01-27 | 4 | -174/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | someone claimed to write a module with this functionality, if a template were provided. And indeed, it was provided but never anything happend (at least nothing was contributed back...). Removing this silly template now. If someone really intends to take up on it, get a copy from older git versions. | ||||
* | | | | ompipe: cosmetic, rename var | Rainer Gerhards | 2012-01-27 | 1 | -12/+12 |
| | | | | |||||
* | | | | ompipe: support for v6 config system added | Rainer Gerhards | 2012-01-27 | 2 | -9/+63 |
| | | | | |||||
* | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2012-01-27 | 3 | -10/+11 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac | ||||
| * | | | | preparing for 5.9.6v5.9.5 | Rainer Gerhards | 2012-01-27 | 2 | -8/+4 |
| | | | | | |||||
| * | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-01-27 | 3 | -3/+8 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac | ||||
| | * | | | | bugfix: action stats did invalidly contain already-discarded messages | Rainer Gerhards | 2012-01-27 | 2 | -4/+5 |
| | | | | | | |||||
| | * | | | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-01-24 | 4 | -3/+9 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | Conflicts: configure.ac | ||||
| | | * | | | mentioning license change in ChangeLog | Rainer Gerhards | 2012-01-21 | 1 | -0/+1 |
| | | | | | | |||||
| | | * | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-21 | 2 | -0/+3 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | | | * | | license docs were not properly redistributed | Rainer Gerhards | 2012-01-21 | 2 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | thanks to Tomas Heinrich for alerting me. | ||||
* | | | | | | Merge branch 'v5-devel' & fix bug in BSD imklog driver | Rainer Gerhards | 2012-01-23 | 10 | -2105/+185 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imklog/ksym.c plugins/imklog/linux.c | ||||
| * | | | | | imklog: forgot to remove one file; now done | Rainer Gerhards | 2012-01-23 | 1 | -35/+0 |
| | | | | | | |||||
| * | | | | | refactored imklog linux driver, now combined with BSD driver | Rainer Gerhards | 2012-01-23 | 9 | -2063/+176 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Linux driver no longer supports outdated kernel symbol resolution, which was disabled by default for very long. Also overall cleanup, resulting in much smaller code. Linux and BSD are now covered by a single small driver. | ||||
* | | | | | | cosmetic: remove compiler warnings | Rainer Gerhards | 2012-01-19 | 4 | -5/+4 |
| | | | | | | |||||
* | | | | | | refactor: removing dead apc code | Rainer Gerhards | 2012-01-19 | 6 | -466/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | another concept that did not prove valuable enough to be kept active. For the last couple of releases, the dead code was kept inside the project as we thought we could probably reuse it. Doesn't look so... | ||||
* | | | | | | refactor: remove very old sync.[ch] system for "abstracting" mutex access | Rainer Gerhards | 2012-01-19 | 6 | -114/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | This was a bad idea that never was used much. |