Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-08-25 | 1 | -8/+8 | |
|\| | | ||||||
| * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-08-25 | 1 | -8/+8 | |
| |\| | ||||||
| | * | changed TRUE/FALSE to RSTRUE/RSFALSE | Rainer Gerhards | 2012-08-22 | 1 | -7/+7 | |
| | * | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-06-11 | 1 | -1/+1 | |
| | |\ | ||||||
| | | * | bugfix: "last message repeated n times" message was missing hostname | Rainer Gerhards | 2012-06-11 | 1 | -1/+1 | |
* | | | | Merge branch 'beta' | Rainer Gerhards | 2012-07-24 | 1 | -3/+1 | |
|\| | | | ||||||
| * | | | debug log: emit (some) action queue parameters to debug log | Rainer Gerhards | 2012-07-05 | 1 | -3/+1 | |
* | | | | Merge branch 'beta' | Rainer Gerhards | 2012-06-29 | 1 | -1/+2 | |
|\| | | | ||||||
| * | | | Merge branch 'master-elasticsearch' into tmp | Rainer Gerhards | 2012-06-29 | 1 | -1/+2 | |
| |\ \ \ | ||||||
| | * | | | omelasticsearch: added transactional interface & better debug output | Rainer Gerhards | 2012-05-24 | 1 | -1/+2 | |
* | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-06-27 | 1 | -32/+0 | |
|\| | | | | ||||||
| * | | | | cleanup: remove config scoping system left-over | Rainer Gerhards | 2012-06-27 | 1 | -28/+0 | |
| * | | | | bugfix: $ActionName was not properly honored | Rainer Gerhards | 2012-06-27 | 1 | -4/+0 | |
* | | | | | change action queue default enqueue timeout from 2000ms to 50ms | Rainer Gerhards | 2012-06-01 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Merge branch 'v5-beta' into beta | Rainer Gerhards | 2012-06-01 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| / / | |/ / | ||||||
| * | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-06-01 | 1 | -1/+1 | |
| |\| | ||||||
| | * | bugfix: delayble source could block action queue, ... | Rainer Gerhards | 2012-06-01 | 1 | -1/+1 | |
| * | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-04-07 | 1 | -2/+3 | |
| |\ \ | ||||||
| | * | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-07 | 1 | -2/+3 | |
| | |\| | ||||||
| | | * | bugfix: memory leak in array passing output module mode | Rainer Gerhards | 2012-03-17 | 1 | -2/+3 | |
| * | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-03-12 | 1 | -0/+6 | |
| |\| | | ||||||
| | * | | queue: lightdelay config: keep default of 70% until mark is explicitely set | Rainer Gerhards | 2012-02-22 | 1 | -3/+5 | |
| | * | | added configuration directives to customize queue light delay marks | Rainer Gerhards | 2012-02-21 | 1 | -0/+4 | |
| | * | | stats: generate friendly name for action queues, if possible | Rainer Gerhards | 2012-01-31 | 1 | -2/+7 | |
* | | | | action cfg: do no longer require template for TPL_AS_MSG passing mode | Rainer Gerhards | 2012-03-19 | 1 | -1/+3 | |
* | | | | bugfix: memory leak in array passing output module mode | Rainer Gerhards | 2012-03-17 | 1 | -2/+3 | |
* | | | | 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 | |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | |