summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screwed up during merge - solving that mess ;)Rainer Gerhards2012-03-011-65/+6
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'v6-stable'Rainer Gerhards2012-03-011-0/+68
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v6-stable'Rainer Gerhards2012-03-012-2/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new code works with libee 0.4.0 as wellRainer Gerhards2012-03-011-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes needed for libee 0.4.2Rainer Gerhards2012-02-282-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | milestone: parsing audit message almost correctRainer Gerhards2012-02-241-9/+133
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mmaudit: added skeleton (copy of mmjsonparse)Rainer Gerhards2012-02-234-0/+286
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'v5-devel' & fix bug in BSD imklog driverRainer Gerhards2012-01-2310-2105/+185
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | imklog: forgot to remove one file; now doneRainer Gerhards2012-01-231-35/+0
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactored imklog linux driver, now combined with BSD driverRainer Gerhards2012-01-239-2063/+176
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cosmetic: remove compiler warningsRainer Gerhards2012-01-194-5/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactor: removing dead apc codeRainer Gerhards2012-01-196-466/+0
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactor: remove very old sync.[ch] system for "abstracting" mutex accessRainer Gerhards2012-01-196-114/+8
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | omshell: light cleanupRainer Gerhards2012-01-191-11/+7
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cleanup: different text escape types made more portableRainer Gerhards2012-01-192-15/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactor: removing v6.1 scoping codeRainer Gerhards2012-01-192-140/+12
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | v6.1/2 scoping support removed from pluginsRainer Gerhards2012-01-1920-97/+39
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'v6-stable'Rainer Gerhards2012-01-194-16/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v6-stable-noscoping' into masterRainer Gerhards2012-01-1938-308/+308
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \