summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* mmjsonparse: changed cookie back to @cee: after discussion with BalabitRainer Gerhards2012-02-221-1/+1
* added mmjsonparse to support recognizing and parsing JSON enhanced syslog mes...Rainer Gerhards2012-02-215-3/+282
* bugfix: property $!all-json made rsyslog abort if no normalized data is avail...Rainer Gerhards2012-02-212-4/+13
* dns cache: working on invalid resolution bug, againRainer Gerhards2012-02-094-5/+8
* dns cache: experimental fix for name resulution problemRainer Gerhards2012-02-081-1/+1
* Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslogRainer Gerhards2012-02-082-31/+28
|\
| * dns chache: added some more error instrumentationRainer Gerhards2012-02-062-31/+28
* | omsnmp: support for new config system added & some refactoringRainer Gerhards2012-02-082-100/+146
|/
* Merge branch 'v6-stable'Rainer Gerhards2012-02-031-16/+14
|\
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-02-031-16/+14
| |\
| | * Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-02-031-16/+14
| | |\
| | | * ommysql: put under ASL 2.0Rainer Gerhards2012-02-031-16/+14
* | | | upgraded omlibdbi to support the new v6 config formatRainer Gerhards2012-02-023-24/+119
* | | | ommysql: updated docRainer Gerhards2012-02-021-16/+30
* | | | bugfix: abort during startup when rsyslog.conf v6+ format was used in a certa...Rainer Gerhards2012-02-025-6/+13
* | | | ommysql: added support for v6 config formatRainer Gerhards2012-02-023-0/+118
* | | | nit: release date for 6.3.7v6.3.7Rainer Gerhards2012-02-021-1/+1
* | | | cleanup: remove code for no-longer needed legacy conf functionalityRainer Gerhards2012-02-013-8/+5
* | | | conf file: bufgix: legacy parsing of some filters did not work correctlyRainer Gerhards2012-02-014-6/+6
* | | | omsnmp: fixing compile problemRainer Gerhards2012-02-012-4/+3
* | | | omgssapi: fix compile errorsRainer Gerhards2012-02-011-9/+2
* | | | Merge branch 'v6-stable'Rainer Gerhards2012-02-011-4/+4
|\| | |
| * | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-02-010-0/+0
| |\| |
| | * | undoing last commit: wrong branchRainer Gerhards2012-01-301-1/+1
| | * | indicated special versionRainer Gerhards2012-01-301-1/+1
| * | | omgssapi: made recompile againRainer Gerhards2012-02-011-4/+4
* | | | preparing for 6.3.7Rainer Gerhards2012-01-313-44/+35
* | | | bugfix: rsyslog aborted during startup if there is an error in loading an actionRainer Gerhards2012-01-274-24/+20
* | | | Merge branch 'v6-stable'Rainer Gerhards2012-01-276-47/+62
|\| | |
| * | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-278-48/+69
| |\| |
| | * | added merged v4 bugfix info to changelogRainer Gerhards2012-01-271-0/+4
| | * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-277-47/+59
| | |\|
| | | * bugfix: omprog made rsyslog abort on startup if not binary to execute was con...Rainer Gerhards2012-01-273-0/+9
| | | * relicense unlimited_select.h under ASL 2.0Rainer Gerhards2012-01-261-15/+14
| | | * increased max config file line size to 64kRainer Gerhards2012-01-242-1/+7
| | | * licensing changeRainer Gerhards2012-01-212-31/+29
| * | | mentioning license change in ChangeLogRainer Gerhards2012-01-211-0/+1
* | | | omprog: added support for v6 config systemRainer Gerhards2012-01-272-1/+67
* | | | cleanup: remove omdbalertingRainer Gerhards2012-01-274-174/+0
* | | | ompipe: cosmetic, rename varRainer Gerhards2012-01-271-12/+12
* | | | ompipe: support for v6 config system addedRainer Gerhards2012-01-272-9/+63
* | | | Merge branch 'v5-devel'Rainer Gerhards2012-01-273-10/+11
|\ \ \ \
| * | | | preparing for 5.9.6v5.9.5Rainer Gerhards2012-01-272-8/+4
| * | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-01-273-3/+8
| |\ \ \ \
| | * | | | bugfix: action stats did invalidly contain already-discarded messagesRainer Gerhards2012-01-272-4/+5
| | * | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-244-3/+9
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | mentioning license change in ChangeLogRainer Gerhards2012-01-211-0/+1
| | | * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-212-0/+3
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | license docs were not properly redistributedRainer Gerhards2012-01-212-0/+3
* | | | | | Merge branch 'v5-devel' & fix bug in BSD imklog driverRainer Gerhards2012-01-2310-2105/+185
|\| | | | |