Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v5-beta' into beta | Rainer Gerhards | 2012-06-01 | 1 | -10/+16 |
|\ | |||||
| * | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-06-01 | 1 | -10/+16 |
| |\ | |||||
| | * | some better code to handle queue congestion | Rainer Gerhards | 2012-06-01 | 1 | -10/+15 |
* | | | Merge branch 'v5-beta' into beta | Rainer Gerhards | 2012-05-29 | 2 | -3/+2 |
|\| | | |||||
| * | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-05-29 | 2 | -3/+2 |
| |\| | |||||
| | * | bugfix: if debug message could end up in log file when forking | Tomas Heinrich | 2012-05-29 | 2 | -3/+2 |
| * | | bugfix: disk queue was not persisted on shutdown, regression of fix to | Rainer Gerhards | 2012-05-10 | 1 | -11/+5 |
* | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-05-10 | 1 | -11/+5 |
|\ \ \ | |||||
| * \ \ | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-05-10 | 1 | -11/+5 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | bugfix: disk queue was not persisted on shutdown, regression of fix to | Rainer Gerhards | 2012-05-10 | 1 | -11/+5 |
| * | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-05-10 | 1 | -13/+0 |
| |\| | | |||||
* | | | | Merge branch 'v5-beta' | Rainer Gerhards | 2012-05-10 | 1 | -13/+0 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-05-10 | 1 | -13/+0 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | cleanup: removing no longer needed macros | Rainer Gerhards | 2012-05-04 | 1 | -13/+0 |
| * | | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-05-03 | 1 | -7/+47 |
| |\| | | |||||
| * | | | Merge branch 'v5-stable-field-substring' into v5-beta | Rainer Gerhards | 2012-04-27 | 1 | -55/+57 |
| |\ \ \ | |||||
| | * | | | added capability to specify substrings for field extraction mode | Rainer Gerhards | 2012-04-27 | 1 | -55/+57 |
| * | | | | Merge branch 'v5-stable-newstats' into v5-beta | Rainer Gerhards | 2012-04-18 | 3 | -5/+41 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-18 | 3 | -5/+41 |
| | |\ \ \ \ | |||||
* | | \ \ \ \ | Merge branch 'v6-stable' | Rainer Gerhards | 2012-05-03 | 1 | -6/+47 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-05-03 | 1 | -7/+47 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | bugfix: rsyslog did not terminate when delayable inputs were blocked | Rainer Gerhards | 2012-05-03 | 1 | -5/+42 |
| | * | | | | | bugfix: inside queue.c, some thread cancel states were not correctly reset. | Rainer Gerhards | 2012-05-03 | 1 | -5/+4 |
| | * | | | | | bugfix: active input in "light delay state" could block rsyslog termination | Rainer Gerhards | 2012-04-27 | 1 | -0/+4 |
| | | |_|_|/ | | |/| | | | |||||
* | | | | | | better debug instrumentation --> input thread names used for reporting | Rainer Gerhards | 2012-05-02 | 1 | -1/+2 |
* | | | | | | added capability to specify substrings for field extraction mode | Rainer Gerhards | 2012-04-26 | 1 | -55/+57 |
* | | | | | | added the "jsonf" property replacer option (and fieldname) & bugfix | Rainer Gerhards | 2012-04-19 | 1 | -37/+93 |
* | | | | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-04-18 | 4 | -5/+64 |
|\| | | | | | |||||
| * | | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-04-18 | 3 | -8/+41 |
| |\| | | | | |||||
| | * | | | | fixed compile bug | Rainer Gerhards | 2012-04-18 | 1 | -1/+1 |
| | | |_|/ | | |/| | | |||||
| | * | | | bugfix: assigned ruleset was lost when using disk queues | Rainer Gerhards | 2012-04-18 | 3 | -8/+41 |
| * | | | | Add a system property, PROP_SYS_UPTIME, to place up-time markers into rsyslog... | Steven A. Falco | 2012-04-13 | 2 | -0/+21 |
| * | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-04-12 | 1 | -44/+64 |
| |\| | | | |||||
* | | | | | bugfix: report error if module tries to request more strings than supported | Rainer Gerhards | 2012-04-13 | 2 | -4/+8 |
* | | | | | Merge branch 'v5-beta' | Rainer Gerhards | 2012-04-12 | 1 | -30/+58 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-04-12 | 1 | -30/+58 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-12 | 1 | -30/+58 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | Free also LocalDomain in glbl class destructor | Marius Tomaschewski | 2012-04-11 | 1 | -0/+1 |
| | | * | | bugfix: hostname was not requeried on HUP | Rainer Gerhards | 2012-04-11 | 1 | -44/+63 |
* | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2012-04-07 | 1 | -31/+38 |
|\| | | | | |||||
| * | | | | permit size modifiers (k,m,g,...) in integer config parameters | Rainer Gerhards | 2012-04-07 | 1 | -31/+38 |
| * | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-04-07 | 4 | -53/+123 |
| |\| | | | |||||
| * | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-03-14 | 4 | -38/+60 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-03-12 | 7 | -5/+74 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2012-03-01 | 3 | -16/+19 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | Merge branch 'v5-stable-newstats' | Rainer Gerhards | 2012-04-07 | 8 | -52/+177 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-07 | 1 | -4/+8 |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | |||||
| * | | | | | | | unified use of $LocalHostIPIF among all locally-emitting inputs | Rainer Gerhards | 2012-03-22 | 1 | -1/+1 |
| * | | | | | | | milestone: added capability to use a local interface IP address as fromhost-ip | Rainer Gerhards | 2012-03-21 | 2 | -47/+113 |
| * | | | | | | | do not provide weblink with meaningless (generic) error code | Rainer Gerhards | 2012-03-21 | 1 | -2/+2 |
| | |_|_|_|/ / | |/| | | | | |