Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | bugfix: abort during startup when rsyslog.conf v6+ format was used in a certa... | Rainer Gerhards | 2012-02-02 | 1 | -2/+2 |
* | Merge branch 'v5-devel' | Rainer Gerhards | 2012-01-27 | 1 | -3/+4 |
|\ | |||||
| * | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-01-27 | 1 | -3/+4 |
| |\ | |||||
| | * | bugfix: action stats did invalidly contain already-discarded messages | Rainer Gerhards | 2012-01-27 | 1 | -3/+4 |
* | | | refactor: removing dead apc code | Rainer Gerhards | 2012-01-19 | 1 | -1/+0 |
* | | | refactor: remove very old sync.[ch] system for "abstracting" mutex access | Rainer Gerhards | 2012-01-19 | 1 | -5/+5 |
* | | | Merge branch 'v6-stable-noscoping' into master | Rainer Gerhards | 2012-01-19 | 1 | -31/+31 |
|\ \ \ | |||||
| * | | | undoing v6.1 config scoping interface, part I | Rainer Gerhards | 2012-01-18 | 1 | -31/+31 |
* | | | | Merge branch 'v5-devel' into master | Rainer Gerhards | 2012-01-18 | 1 | -1/+1 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge branch 'v5-stable-elasticsearch' into v5-devel-tmp | Rainer Gerhards | 2012-01-17 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | add JSON escaping option | Nathan Scott | 2012-01-17 | 1 | -1/+1 |
* | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-12-19 | 1 | -7/+58 |
|\| | | | | |||||
| * | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2011-12-19 | 1 | -3/+6 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | better performance for action stats & cleanup: removing debug prints | Rainer Gerhards | 2011-12-19 | 1 | -3/+6 |
| * | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2011-12-19 | 1 | -0/+5 |
| |\| | | | |||||
| | * | | | additional counter for lost messages due to failed actions added | Rainer Gerhards | 2011-12-19 | 1 | -0/+5 |
| * | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2011-12-19 | 1 | -1/+1 |
| |\| | | | |||||
| | * | | | added instrumentation | Rainer Gerhards | 2011-12-19 | 1 | -3/+45 |
| | |/ / | |||||
| * | | | fixing memory leak in new stats code (delete statsobj) | Rainer Gerhards | 2011-12-16 | 1 | -0/+6 |
| * | | | experimental: added first stats counter to action object | Rainer Gerhards | 2011-12-16 | 1 | -6/+43 |
| * | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-10-17 | 1 | -10/+9 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-08-31 | 1 | -25/+23 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'v5-stable' into v5-devel | Andre Lorbach | 2011-08-18 | 1 | -2/+15 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | Merge branch 'beta' | Rainer Gerhards | 2011-12-12 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-12-01 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-12-01 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | | * | | | | Merge branch 'v3-stable' into v4-stable | Rainer Gerhards | 2011-12-01 | 1 | -1/+1 |
| | | |\ \ \ \ | |||||
| | | | * | | | | bugfix: action resume interval incorrectly handled, thus took longer to resume | Tomas Heinrich | 2011-12-01 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'beta' | Rainer Gerhards | 2011-10-17 | 1 | -10/+9 |
|\| | | | | | | | |||||
| * | | | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-10-17 | 1 | -10/+9 |
| |\| | | | | | | |||||
| | * | | | | | | Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stable | Rainer Gerhards | 2011-10-17 | 1 | -1/+0 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-10-13 | 1 | -1/+0 |
| | | |\| | | | | | | | | |_|_|_|/ | | | |/| | | | | |||||
| | | | * | | | | bugfix: $ActionExecOnlyOnce interval did not work properly | Tomas Heinrich | 2011-10-13 | 1 | -1/+0 |
| | * | | | | | | bugfix: ActionQueue could malfunction due to index error | Vlad Grigorescu | 2011-10-17 | 1 | -9/+9 |
| | |/ / / / / | |||||
* | | | | | | | added support for v6 config system to omfwd | Rainer Gerhards | 2011-10-11 | 1 | -1/+6 |
* | | | | | | | Merge branch 'beta' | Rainer Gerhards | 2011-08-31 | 1 | -24/+22 |
|\| | | | | | | |||||
| * | | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-08-31 | 1 | -25/+23 |
| |\| | | | | | |||||
| | * | | | | | bugfix: mark message processing did not work correctly | Rainer Gerhards | 2011-08-31 | 1 | -25/+23 |
| | | |_|_|/ | | |/| | | | |||||
* | | | | | | Merge branch 'beta' | Andre Lorbach | 2011-08-18 | 1 | -2/+15 |
|\| | | | | | |||||
| * | | | | | Merge branch 'v5-stable' into beta | Andre Lorbach | 2011-08-18 | 1 | -2/+15 |
| |\| | | | | |||||
| | * | | | | removed debug code from action.c and runtime/queue.c after testing | Andre Lorbach | 2011-08-18 | 1 | -17/+0 |
| | * | | | | bugfix: fixed incorrect state handling for Discard Action (transactions) | Andre Lorbach | 2011-08-18 | 1 | -2/+32 |
* | | | | | | milestone: queue-params are properly initialized for action queues | Rainer Gerhards | 2011-08-01 | 1 | -14/+15 |
* | | | | | | milestone: generic action parameters parsed via new config system | Rainer Gerhards | 2011-08-01 | 1 | -27/+87 |
* | | | | | | milestone: queue object now has a param handler for new conf interface | Rainer Gerhards | 2011-07-22 | 1 | -51/+37 |
* | | | | | | milestone: omfile basically gets its parameters via the new system | Rainer Gerhards | 2011-07-21 | 1 | -3/+20 |
* | | | | | | fixing minor memory leaks | Rainer Gerhards | 2011-07-21 | 1 | -0/+1 |
* | | | | | | milestone: new output plugin interface call added | Rainer Gerhards | 2011-07-21 | 1 | -1/+5 |
* | | | | | | milestone: done plumbing to call plugin create action instance entry point | Rainer Gerhards | 2011-07-20 | 1 | -0/+100 |
* | | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-06-27 | 1 | -1/+6 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | |