Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | cleanup: remove code for no-longer needed legacy conf functionality | Rainer Gerhards | 2012-02-01 | 1 | -1/+1 |
* | conf file: bufgix: legacy parsing of some filters did not work correctly | Rainer Gerhards | 2012-02-01 | 1 | -1/+1 |
* | bugfix: rsyslog aborted during startup if there is an error in loading an action | Rainer Gerhards | 2012-01-27 | 1 | -5/+1 |
* | Merge branch 'v6-stable' | Rainer Gerhards | 2012-01-27 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-01-27 | 1 | -1/+4 |
| |\ | |||||
| | * | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-27 | 1 | -1/+4 |
| | |\ | |||||
| | | * | increased max config file line size to 64k | Rainer Gerhards | 2012-01-24 | 1 | -1/+4 |
* | | | | refactor: removing v6.1 scoping code | Rainer Gerhards | 2012-01-19 | 1 | -121/+1 |
* | | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-01-19 | 1 | -4/+2 |
|\| | | | |||||
| * | | | removing the newScope/resumeScope macro interfaces | Rainer Gerhards | 2012-01-19 | 1 | -4/+2 |
* | | | | Merge branch 'v6-stable-noscoping' into master | Rainer Gerhards | 2012-01-19 | 1 | -6/+1 |
|\| | | | |||||
| * | | | undoing v6.1 config scoping interface, part I | Rainer Gerhards | 2012-01-18 | 1 | -6/+1 |
| * | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-01-18 | 1 | -20/+16 |
| |\| | | |||||
* | | | | Merge branch 'v5-stable' into master | Rainer Gerhards | 2012-01-18 | 1 | -20/+16 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-14 | 1 | -20/+16 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | license change | Rainer Gerhards | 2012-01-14 | 1 | -20/+16 |
| | * | | Merge branch 'v3-stable' into v4-stable | Rainer Gerhards | 2010-12-16 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * | | improved some code based on clang static analyzer results | Rainer Gerhards | 2010-12-16 | 1 | -1/+1 |
* | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-01-09 | 1 | -0/+5 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | removing $Begin, $End, $StrictScoping directives | Rainer Gerhards | 2012-01-09 | 1 | -0/+5 |
| * | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-10-21 | 1 | -1/+1 |
| |\| | | | |||||
* | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-10-21 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-10-21 | 1 | -1/+1 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | bugfix: missing whitespace after property-based filter was not detected | Rainer Gerhards | 2011-10-21 | 1 | -1/+1 |
* | | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-09-26 | 1 | -0/+7 |
|\| | | | | | |||||
| * | | | | | added capability to emit config error location info for warnings | Rainer Gerhards | 2011-08-09 | 1 | -5/+26 |
* | | | | | | milestone: generic action parameters parsed via new config system | Rainer Gerhards | 2011-08-01 | 1 | -1/+2 |
* | | | | | | milestone: queue object now has a param handler for new conf interface | Rainer Gerhards | 2011-07-22 | 1 | -1/+1 |
* | | | | | | milestone: done plumbing to call plugin create action instance entry point | Rainer Gerhards | 2011-07-20 | 1 | -40/+0 |
* | | | | | | milestone: added module config names | Rainer Gerhards | 2011-07-20 | 1 | -81/+0 |
* | | | | | | Merge branch 'master-newconf' | Rainer Gerhards | 2011-07-12 | 1 | -365/+23 |
|\ \ \ \ \ \ | |||||
| * | | | | | | more cleanup, working on emergency config system | Rainer Gerhards | 2011-07-11 | 1 | -2/+5 |
| * | | | | | | more cleanup | Rainer Gerhards | 2011-07-11 | 1 | -8/+0 |
| * | | | | | | cleanup, removing now unused code | Rainer Gerhards | 2011-07-11 | 1 | -83/+0 |
| * | | | | | | cleaup & emergency config system reactivated | Rainer Gerhards | 2011-07-09 | 1 | -257/+0 |
| * | | | | | | milestone/[PARTWORK]: integrted script filter, but var access is missing | Rainer Gerhards | 2011-07-07 | 1 | -3/+7 |
| * | | | | | | milestone:/[PARTWORK]: config is processed using new parser, except... | Rainer Gerhards | 2011-07-06 | 1 | -16/+15 |
* | | | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-07-11 | 1 | -12/+5 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | |||||
| * / / / / | cosmetic: reformatted some code | Rainer Gerhards | 2011-06-30 | 1 | -12/+5 |
| |/ / / / | |||||
* | | | | | step: put plumbing in place for new input module config system | Rainer Gerhards | 2011-05-03 | 1 | -16/+18 |
* | | | | | step: config-specific module list used during config processing | Rainer Gerhards | 2011-04-27 | 1 | -4/+4 |
* | | | | | step: added config-specific module list | Rainer Gerhards | 2011-04-27 | 1 | -1/+1 |
* | | | | | step: $ModLoad handler no longe requries conf obj | Rainer Gerhards | 2011-04-27 | 1 | -3/+2 |
* | | | | | step: config handler setting from syslogd.c moved to rsconf.c | Rainer Gerhards | 2011-04-21 | 1 | -3/+3 |
* | | | | | some more work was required on the ruleset modification | Rainer Gerhards | 2011-04-19 | 1 | -1/+1 |
* | | | | | milestone: ruleset now supports rsconf_t | Rainer Gerhards | 2011-04-19 | 1 | -8/+7 |
* | | | | | milestone: conf obj interface now utilzes rsconf_t | Rainer Gerhards | 2011-04-19 | 1 | -22/+22 |
* | | | | | milestone: templates are now in config object | Rainer Gerhards | 2011-04-19 | 1 | -1/+1 |
* | | | | | renaming conf.* wasn't a good idea -- undoing | Rainer Gerhards | 2011-04-19 | 1 | -0/+1453 |
* | | | | | renamed conf.c to legacyconf.c to make room for new config system | Rainer Gerhards | 2011-04-19 | 1 | -1453/+0 |
| |/ / / |/| | | |