summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix printing of some template optionsMiloslav Trmač2012-08-261-1/+4
| | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* cleanup: remove left-over commented-out codeRainer Gerhards2012-08-251-10/+0
|
* Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-08-2521-105/+193
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/manual.html runtime/ruleset.c template.h threads.c tools/syslogd.c
| * Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stableRainer Gerhards2012-08-253-30/+48
| |\ | | | | | | | | | | | | Conflicts: template.c
| | * change template.[ch] to ASL 2.0, removing a GPLv3-only patchRainer Gerhards2012-08-253-30/+48
| | | | | | | | | | | | | | | see template.c file header for details Note that this functionality was almost never used in practice
| * | preparing for 5.10.0 releaseRainer Gerhards2012-08-224-4/+11
| | |
| * | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-08-221-2/+6
| |\| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * preparing for 5.8.13 releaseRainer Gerhards2012-08-223-3/+3
| | |
| | * nit: forward-compatible default ruleset name as used in next versionRainer Gerhards2012-08-221-1/+1
| | |
| * | small bugfix: stream timeout API use was incorrectRainer Gerhards2012-08-221-2/+2
| | | | | | | | | | | | Thanks to Andre Lorbach for mentioning this.
| * | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-08-226-18/+119
| |\| | | | | | | | | | | | | Conflicts: runtime/ruleset.c
| | * bugfix: multiple main queues with same queue file name were not detectedRainer Gerhards2012-08-223-3/+48
| | | | | | | | | | | | | | | | | | This lead to queue file corruption. While the root cause is a config error, it is a bug that this important and hard to find config error was not detected by rsyslog.
| * | changed TRUE/FALSE to RSTRUE/RSFALSERainer Gerhards2012-08-2214-46/+45
| | | | | | | | | | | | This is done to prevent name claches with libraries.
| * | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-154-13/+10
| |\ \
| * \ \ Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-113-5/+15
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
* | \ \ \ Merge branch 'beta' into v6-stableRainer Gerhards2012-08-20211-11720/+15449
|\ \ \ \ \
| * | | | | nitfix: status indication (now: stable) was invalid in ChangeLogRainer Gerhards2012-08-201-1/+1
| | | | | |
| * | | | | Merge branch 'v5-stable' into betaRainer Gerhards2012-08-203-3/+61
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | nitfix: remove quirck in new debug message codeRainer Gerhards2012-08-011-4/+2
| | | | | |
| | * | | | more elaborate debug logging for object deserializerRainer Gerhards2012-08-011-0/+39
| | | | | |
| | * | | | undo last queue patch - caused a regressionRainer Gerhards2012-08-012-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | some more elaborate patch is needed and will be provided
| | * | | | bugfix: potential abort if output plugin logged message during shutdownRainer Gerhards2012-08-012-7/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | note that none of the rsyslog-provided plugins does this Thanks to bodik and Rohit Prasad for alerting us on this bug and analyzing it. fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=347
| | * | | | bugfix: DA queue fixed handling of bad queue files.Andre Lorbach2012-07-312-1/+5
| | | | | |
| * | | | | preparing for 6.4.0 releaseRainer Gerhards2012-08-203-3/+6
| | | | | |
| * | | | | doc: add last patch to ChangelogRainer Gerhards2012-08-011-0/+3
| | | | | |
| * | | | | fix problem with cutting first 16 characters from message with bAnnotate on ↵Milan Bartos2012-08-011-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | modified: plugins/imuxsock/imuxsock.c
| * | | | | bugfix: imptcp aborted when $InputPTCPServerBindRuleset was usedRainer Gerhards2012-07-242-1/+2
| | | | | |
| * | | | | Merge branch 'v5-stable' into betaRainer Gerhards2012-07-243-9/+10
| |\| | | |
| * | | | | omelasticsearch: regression from "parent" feature could case abortsRainer Gerhards2012-07-111-23/+26
| | | | | | | | | | | | | | | | | | | | | | | | this was not present in any released version
| * | | | | bugfix: imtcp aborted when more than 2 connections were used.Andre Lorbach2012-07-114-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incremented pthread stack size to 4MB for imtcp, imptcp and imttcp closes: http://bugzilla.adiscon.com/show_bug.cgi?id=342
| * | | | | omelasticsearch: support for parameters parent & dynparent addedRainer Gerhards2012-07-102-20/+98
| | | | | |
| * | | | | omelasticsearch: implement retry via request to es server homepageRainer Gerhards2012-07-101-10/+60
| | | | | |
| * | | | | omelasticsearch: better debug instrumentationRainer Gerhards2012-07-092-17/+33
| | | | | |
| * | | | | debug log: cleaned up & streamlined queue param outputRainer Gerhards2012-07-051-20/+43
| | | | | |
| * | | | | debug log: emit (some) action queue parameters to debug logRainer Gerhards2012-07-053-3/+28
| | | | | |
| * | | | | preparing for 6.3.12v6.3.12Rainer Gerhards2012-07-023-5/+3
| | | | | |
| * | | | | cosmetic: added info about omelasticsearch to ChangeLogRainer Gerhards2012-06-291-0/+7
| | | | | |
| * | | | | Merge branch 'master-elasticsearch' into tmpRainer Gerhards2012-06-296-52/+380
| |\ \ \ \ \
| | * | | | | omelasticsearch: bugfix: bulkmode setting was not properly initializedRainer Gerhards2012-06-131-0/+1
| | | | | | |
| | * | | | | omelasticsearch: dyn index&type now also supported in bulk modeRainer Gerhards2012-05-281-4/+7
| | | | | | |
| | * | | | | omelasticsearc: milestone, bulk insert basically worksRainer Gerhards2012-05-251-50/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dynamic index&type is not yet used, but easy to add (did not manage to get it in today...)
| | * | | | | omelasticsearch: test commit, first shot at bulk interfaceRainer Gerhards2012-05-251-11/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This obviously does not work correctly. So expect problems if you set bulkmode="on".
| | * | | | | omelasticsearch: added transactional interface & better debug outputRainer Gerhards2012-05-243-3/+39
| | | | | | |
| | * | | | | property replacer lost one char when json escaping was necessaryRainer Gerhards2012-05-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The character immediately in front of the first escape was lost.
| | * | | | | omelasticsearch: provide authentication support (UNTESTED)Rainer Gerhards2012-04-252-0/+29
| | | | | | |
| | * | | | | Merge branch 'master' into master-elasticsearchRainer Gerhards2012-04-2339-316/+825
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/omelasticsearch/omelasticsearch.c
| | * | | | | | omelasticsearch: added asnycRepl and timeout config paramsRainer Gerhards2012-04-161-3/+26
| | | | | | | |
| | * | | | | | omelasticsearch: permit dynamic index/type parameters (just like dynafile)Rainer Gerhards2012-04-131-16/+107
| | | | | | | |
| | * | | | | | permitting plugins to use three string requestsRainer Gerhards2012-04-132-4/+8
| | | | | | | |
| | * | | | | | imuxsock: mini bugfix: closed fd was tried to close second timeRainer Gerhards2012-04-131-3/+6
| | | | | | | |
generated by cgit (git 2.34.1) at 2024-06-10 17:55:11 +0000