| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'beta' | Rainer Gerhards | 2011-06-21 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/Makefile.am tests/manytcp-too-few-tls.sh | ||||
| | * | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-06-21 | 1 | -1/+1 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/diag.sh tests/sndrcv_drvr.sh | ||||
| | | * | bugfix: problems in failover action handling | Rainer Gerhards | 2011-06-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=270 (not yet confirmed!) | ||||
| | * | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-05-09 | 1 | -1/+1 |
| | |\| | | | | | | | | | | | | | Conflicts: tools/omfwd.c | ||||
| | | * | 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 |
| | | | | | | | | | | | | | | | | | | | | | | this still has a couple of weaknesses, like no size limit, no expiration of entries, suboptimal algorithms -- but it should perform better than what we had previously. Implementation will be improved based on feedback during the next couple of releases | ||||
| * | | | regression fix: config validation code affected by recent changes | Rainer Gerhards | 2011-05-30 | 1 | -0/+4 |
| | | | | | | | | | | | | | did not return with proper return value | ||||
| * | | | 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 |
| | | | | | | | | | | | | | ... plus some minor cleanup/code shuffle | ||||
| * | | | 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 |
| | | | | | | | | | | | | | | | | too many dependencies, things get cluttered (and merging probably gets problematic). Now new config will be "conf2". | ||||
| * | | | 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 |
| |\| | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html doc/rsyslog_conf.html runtime/msg.c runtime/rsyslog.h template.c | ||||
| | * | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2011-03-16 | 1 | -1/+1 |
| | |\ | | | | | | | | | | | | | Conflicts: tests/Makefile.am | ||||
| | | * | 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 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/omlibdbi/omlibdbi.c tests/Makefile.am tests/diag.sh | ||||
| | * | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2011-03-08 | 1 | -0/+5 |
| | |\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tests/Makefile.am tools/syslogd.c | ||||
| | | * | bugfix(kind of): tell users that config graph can currently not be generated | Rainer Gerhards | 2011-03-08 | 1 | -0/+5 |
| | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=232 | ||||
| * | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-02-25 | 1 | -2/+1 |
| |\| | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | | cosmetic: removing commented-out testing aid | Rainer Gerhards | 2011-02-25 | 1 | -1/+0 |
| | | | | |||||
| | * | | bugfix (minor): warning message suggested invalid compatibility mode | Rainer Gerhards | 2011-02-22 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-02-18 | 1 | -3/+2 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/glbl.c tools/omdiscard.c | ||||
| | * | | cleanup: no longer parameter in iminternal system removed | Rainer Gerhards | 2011-02-16 | 1 | -3/+2 |
| | | | | |||||
| * | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-02-11 | 1 | -3/+36 |
| |\| | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | | fixed some compile issues in recent systemd patch | Rainer Gerhards | 2011-02-11 | 1 | -1/+1 |
| | | | | |||||
| | * | | Improved systemd socket activation support | Marius Tomaschewski | 2011-02-11 | 1 | -3/+36 |
| | | | | | | | | | | | | | | | | | | | Support for multiple unix sockets and activation in forking mode Signed-off-by: Marius Tomaschewski <mt@suse.de> | ||||
| * | | | Merge branch 'v5-devel' | Rainer Gerhards | 2010-12-17 | 1 | -11/+8 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c plugins/imudp/imudp.c runtime/glbl.c | ||||
| | * | | Merge branch 'v4-devel' into v5-devel | Rainer Gerhards | 2010-12-17 | 1 | -3/+0 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/imfile.html doc/manual.html plugins/imudp/imudp.c runtime/msg.h tools/syslogd.c | ||||
| | | * | | added $LocalHostName config directive & some bugfixing | Rainer Gerhards | 2010-12-16 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | - added $LocalHostName config directive - bugfix: local hostname was pulled too-early, so that some config directives (namely FQDN settings) did not have any effect | ||||
| | | * | | cleanup of cosmetic nit (result of clang static code analyser run) | Rainer Gerhards | 2010-12-16 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Merge branch 'v4-stable' into v4-devel | Rainer Gerhards | 2010-12-16 | 1 | -2/+0 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/parser.c | ||||
| | | | * | | some cleanup based on clang static analyzer results | Rainer Gerhards | 2010-12-16 | 1 | -2/+0 |
| | | | | | | |||||
| | * | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2010-12-17 | 1 | -1/+1 |
| | |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | | * | | | fixed cosmetic nit (as a result of clang static code analyzer run) | Rainer Gerhards | 2010-12-16 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Merge branch 'v4-devel' into v5-beta | Rainer Gerhards | 2010-10-15 | 1 | -1/+1 |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile.am tests/tcpflood.c | ||||
| | * | | | | bugfix: one type of 64bit atomics was enabled when 32bit atomics were supported | Rainer Gerhards | 2010-12-02 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | | | | | | | also cleaned up some minor things | ||||
| * | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2010-10-05 | 1 | -4/+3 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c runtime/rsyslog.h | ||||
| | * | | | | minor: improved error message when already running | Rainer Gerhards | 2010-09-17 | 1 | -4/+3 |
| | | | | | | |||||
| * | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2010-09-08 | 1 | -29/+32 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac | ||||
| | * | | | | Merge branch 'systemd' into v5-devel | Rainer Gerhards | 2010-09-08 | 1 | -29/+32 |
| | |\ \ \ \ | |||||
 |
index : rsyslog | |
| Modifications to rsyslog---see v3-stable-kaz branch | kaz@kylheku.com |
| summaryrefslogtreecommitdiffstats |