summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* doc: mention imported patches in ChangeLogRainer Gerhards2013-09-031-0/+1
* Merge branch 'v7-stable'Rainer Gerhards2013-09-032-1/+9
|\
| * doc: add some more non-mentioned fixes to ChangeLogRainer Gerhards2013-09-031-0/+4
| * regression fix: previous fix introduced wrong default templateRainer Gerhards2013-09-031-1/+1
| * doc: add missing information (patches) to ChangeLogRainer Gerhards2013-09-031-0/+4
* | Merge branch 'v7-stable'Rainer Gerhards2013-09-0313-15/+20
|\|
| * doc: mention last json-c patch in ChangeLogRainer Gerhards2013-09-031-0/+2
| * make rsyslog use the new json-c pkgconfig file if availablehwoarang2013-09-0312-15/+18
* | Merge branch 'v7-stable'Rainer Gerhards2013-09-022-1/+4
|\|
| * bugfix: imfile parameter "persistStateInterval" was unusableRainer Gerhards2013-09-022-1/+4
* | Merge branch 'v7-stable'Rainer Gerhards2013-09-025-9/+24
|\|
| * doc: add recent patch series to ChangeLogRainer Gerhards2013-09-021-0/+8
| * Using more appropriate helper function to get the error messageAhto Truu2013-09-021-1/+1
| * Better error messages from rsgtutilAhto Truu2013-09-021-4/+4
| * More careful TLV encoding/decodingAhto Truu2013-09-023-4/+11
* | Merge branch 'c9'Rainer Gerhards2013-09-0210-4/+64
|\ \
| * | doc: add "defaultTZ" param to imtcp docRainer Gerhards2013-09-021-2/+13
| * | apply default TZ if none is present in legacy timestampRainer Gerhards2013-09-023-1/+12
| * | milestone: defaultTZ can be set in msg obj (via imtcp)Rainer Gerhards2013-08-307-2/+40
| |/
* | Merge branch 'v7-stable'Rainer Gerhards2013-08-263-2/+4
|\|
| * bugfix: imtcp addtlframedelimiter could not be set to zeroRainer Gerhards2013-08-263-2/+4
* | Merge branch 'v7-stable'Rainer Gerhards2013-08-261-4/+13
|\|
| * doc: update package doc with links to Adiscon's repositoriesFlorian Riedl2013-08-261-4/+13
* | imudp: bugfix: did not compile on some platforms due to dup variableRainer Gerhards2013-08-261-2/+1
* | Merge branch 'v7-stable'Rainer Gerhards2013-08-262-26/+13
|\|
| * doc bugfix: remove no-longer existing omtemplate from developer docRainer Gerhards2013-08-262-26/+11
* | Merge branch 'v7-stable'Rainer Gerhards2013-08-260-0/+0
|\|
| * backport patch to fix configure setsid testRainer Gerhards2013-08-261-1/+1
* | Add autoconf check for setsid().Todd Vierling2013-08-261-1/+1
* | Merge branch 'v7-stable'Rainer Gerhards2013-08-221-2/+2
|\|
| * doc: typo fix (in directive name!)Rainer Gerhards2013-08-221-2/+2
* | Merge branch 'v7-stable'Andre Lorbach2013-08-141-2/+2
|\|
| * Removed SPACE after "MAIL FROM:" and "RCPT TO:" as RFC5321 permits spaces.Andre Lorbach2013-08-141-2/+2
* | Merge branch 'v7-stable'Andre Lorbach2013-08-062-10/+8
|\|
| * Using OMSRsetEntry to set the default action template in omprogAndre Lorbach2013-08-061-8/+3
| * Using OMSRsetEntry to set the default action template in ompipe for now.Andre Lorbach2013-08-061-1/+5
* | Merge branch 'v7-stable'Andre Lorbach2013-07-241-17/+13
|\|
| * Another fix for bugid# 468Andre Lorbach2013-07-241-8/+4
| * Fixing new style config format issues from bugid #468Andre Lorbach2013-07-241-9/+9
* | Merge branch 'v7-stable'Andre Lorbach2013-07-241-6/+14
|\|
| * Fixed another issue related to http://bugzilla.adiscon.com/show_bug.cgi?id=464Andre Lorbach2013-07-241-4/+9
| * Fixed a bug in curlPost related to http://bugzilla.adiscon.com/show_bug.cgi?i...Andre Lorbach2013-07-241-2/+5
| * Fixed bugid #464 in elasticsearch output moduleAndre Lorbach2013-07-230-0/+0
| * Fixed bugid #464 in elasticsearch output moduleAndre Lorbach2013-07-231-0/+6
* | add $!, $., $/ to RSYSLOG_DebugFormatRainer Gerhards2013-07-231-1/+1
* | Merge branch 'master-globalvars'Rainer Gerhards2013-07-238-24/+114
|\ \
| * | doc: add global variablesRainer Gerhards2013-07-231-6/+28
| * | add proper sync to global variablesRainer Gerhards2013-07-231-3/+17
| * | fix: global&local variables could not be accessed via RainerScriptRainer Gerhards2013-07-232-4/+8
| * | first shot at global variables (without proper sync so far)Rainer Gerhards2013-07-226-14/+64