Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v5-devel' into master | Rainer Gerhards | 2012-01-18 | 1 | -1/+7 |
|\ | |||||
| * | Merge branch 'v5-stable-elasticsearch' into v5-devel-tmp | Rainer Gerhards | 2012-01-17 | 1 | -0/+3 |
| |\ | |||||
| | * | add elasticsearch output module | Nathan Scott | 2012-01-17 | 1 | -0/+3 |
| * | | fix error of not define HAVE_SETSID | Peng Haitao | 2012-01-16 | 1 | -0/+7 |
| * | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-01-16 | 1 | -1/+21 |
| |\| | |||||
| * | | Merge branch 'v4-stable-tmp' into v5-devel-tmp | Rainer Gerhards | 2012-01-10 | 1 | -0/+3 |
| |\ \ | |||||
| | * \ | Merge branch 'tmp' into v4-stable-tmp | Rainer Gerhards | 2012-01-10 | 1 | -0/+9 |
| | |\ \ | |||||
| | | * | | added $SpaceLFOnReceive config directive | Tomas Heinrich | 2012-01-10 | 1 | -0/+9 |
| | * | | | Merge branch 'tmp' into v4-stable-tmp | Rainer Gerhards | 2012-01-10 | 1 | -0/+3 |
| | |\| | | |||||
| | | * | | added canned template for ultra-exact sysklogd file format | Tomas Heinrich | 2012-01-10 | 1 | -0/+3 |
* | | | | | Merge branch 'v5-stable' into master | Rainer Gerhards | 2012-01-18 | 1 | -1/+21 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-16 | 1 | -1/+21 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | FQDN hostname for multihomed host was not always set to the correct name | Tomas Heinrich | 2012-01-16 | 1 | -2/+22 |
| | |/ / | |||||
| | * | | Merge branch 'v4-stable' into v4-beta | Rainer Gerhards | 2011-08-30 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * | | bugfix: off-by-one(two) bug in legacy syslog parser | Rainer Gerhards | 2011-08-10 | 1 | -1/+1 |
* | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-09-26 | 1 | -1/+1 |
|\| | | | | |||||
| * | | | | bugfix: rsyslogd -v always said 64 atomics were not present | mono_matsuko | 2011-09-05 | 1 | -1/+1 |
* | | | | | added $InputRELPServerBindRuleset directive to specify rulesets for RELP | Rainer Gerhards | 2011-09-08 | 1 | -1/+2 |
* | | | | | removed compatibility mode as we expect people have adjusted their confs by now | Rainer Gerhards | 2011-07-12 | 1 | -234/+13 |
* | | | | | removed emergency config, do error reporting on fatal config file error | Rainer Gerhards | 2011-07-12 | 1 | -1/+1 |
* | | | | | cleanup, removing now unused code | Rainer Gerhards | 2011-07-11 | 1 | -5/+0 |
* | | | | | milestone/[PARTWORK]: implemented comparison operations | Rainer Gerhards | 2011-07-08 | 1 | -1/+0 |
* | | | | | milestone:/[PARTWORK]: config is processed using new parser, except... | Rainer Gerhards | 2011-07-06 | 1 | -1/+1 |
* | | | | | Merge branch 'beta' | Rainer Gerhards | 2011-06-21 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-06-21 | 1 | -1/+1 |
| |\| | | | | |||||
| | * | | | | bugfix: problems in failover action handling | Rainer Gerhards | 2011-06-16 | 1 | -1/+1 |
| * | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-05-09 | 1 | -1/+1 |
| |\| | | | | |||||
| | * | | | | bugfix(minor): improper template function call in syslogd.c | Rainer Gerhards | 2011-04-19 | 1 | -1/+1 |
* | | | | | | added a first implementation of a DNS name cache | Rainer Gerhards | 2011-06-06 | 1 | -0/+3 |
* | | | | | | regression fix: config validation code affected by recent changes | Rainer Gerhards | 2011-05-30 | 1 | -0/+4 |
* | | | | | | step: moved main message queue activation to after priv drop | Rainer Gerhards | 2011-04-27 | 1 | -12/+1 |
* | | | | | | step: config-specific module list used during config processing | Rainer Gerhards | 2011-04-27 | 1 | -1/+1 |
* | | | | | | step: shuffled module-related code from syslogd.c to rsconf.c | Rainer Gerhards | 2011-04-27 | 1 | -217/+52 |
* | | | | | | step: outchannel list integrated into main config object | Rainer Gerhards | 2011-04-26 | 1 | -41/+20 |
* | | | | | | step: moved config validation code | Rainer Gerhards | 2011-04-26 | 1 | -20/+0 |
* | | | | | | shuffled even more config code from syslgod to config handler | Rainer Gerhards | 2011-04-26 | 1 | -166/+1 |
* | | | | | | step: config handler setting from syslogd.c moved to rsconf.c | Rainer Gerhards | 2011-04-21 | 1 | -351/+41 |
* | | | | | | step: begun to create a "load" interface in rsconf | Rainer Gerhards | 2011-04-21 | 1 | -19/+23 |
* | | | | | | step: slowly migrating config settings... ;) | Rainer Gerhards | 2011-04-19 | 1 | -54/+25 |
* | | | | | | 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 | -11/+11 |
* | | | | | | milestone: conf obj interface now utilzes rsconf_t | Rainer Gerhards | 2011-04-19 | 1 | -13/+51 |
* | | | | | | milestone: templates are now in config object | Rainer Gerhards | 2011-04-19 | 1 | -14/+24 |
* | | | | | | renaming conf.* wasn't a good idea -- undoing | Rainer Gerhards | 2011-04-19 | 1 | -1/+1 |
* | | | | | | renamed conf.c to legacyconf.c to make room for new config system | Rainer Gerhards | 2011-04-19 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-03-31 | 1 | -1/+1 |
|\| | | | | |||||
| * | | | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2011-03-16 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | fixed a regression of last patch and some cleanup | Rainer Gerhards | 2011-03-16 | 1 | -1/+1 |
* | | | | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-03-11 | 1 | -0/+5 |
|\| | | | | | |||||
| * | | | | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2011-03-08 | 1 | -0/+5 |
| |\| | | | |