Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-04-12 | 1 | -73/+97 |
|\ | |||||
| * | imuxsock: do not cache hostname | Rainer Gerhards | 2012-04-12 | 1 | -1/+1 |
| * | Allocate LocalDomain as new string | Marius Tomaschewski | 2012-04-11 | 1 | -0/+3 |
| * | bugfix: hostname was not requeried on HUP | Rainer Gerhards | 2012-04-11 | 1 | -72/+93 |
* | | undoing v6.1 config scoping interface, part I | Rainer Gerhards | 2012-01-18 | 1 | -48/+48 |
* | | Merge branch 'v5-stable' into v6-stable | 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-stable' into beta | 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 |
* | | | | 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 |
* | | | | 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 |
| |\| | | | |||||
| | * | | | bugfix(kind of): tell users that config graph can currently not be generated | Rainer Gerhards | 2011-03-08 | 1 | -0/+5 |
* | | | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-02-25 | 1 | -2/+1 |
|\| | | | | |||||
| * | | | | 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 |
|\| | | | | |||||
| * | | | | 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 |
|\| | | | | |||||
| * | | | | 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 |
* | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2010-12-17 | 1 | -11/+8 |
|\| | | | | |||||
| * | | | | Merge branch 'v4-devel' into v5-devel | Rainer Gerhards | 2010-12-17 | 1 | -3/+0 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | added $LocalHostName config directive & some bugfixing | Rainer Gerhards | 2010-12-16 | 1 | -3/+3 |
| | * | | | 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 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | 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 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | 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 |
| | |\| | | |||||
| * | | | | bugfix: one type of 64bit atomics was enabled when 32bit atomics were supported | Rainer Gerhards | 2010-12-02 | 1 | -7/+7 |
* | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2010-10-05 | 1 | -4/+3 |
|\| | | | | |||||
| * | | | | 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 |
|\| | | | | |||||
| * | | | | Merge branch 'systemd' into v5-devel | Rainer Gerhards | 2010-09-08 | 1 | -29/+32 |
| |\ \ \ \ | |||||
| | * | | | | acquire /dev/log socket optionally from systemd | Lennart Poettering | 2010-09-07 | 1 | -29/+32 |
* | | | | | | Merge branch 'master' into tmp | Rainer Gerhards | 2010-08-11 | 1 | -1/+4 |
|\| | | | | | |||||
| * | | | | | Merge branch 'v4-devel' into master | Rainer Gerhards | 2010-08-11 | 1 | -1/+1 |
| |\ \ \ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | |/| | | |||||
| | * | | | Merge branch 'v4-stable-imptcp' into tmp | Rainer Gerhards | 2010-08-11 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | | * | | | added imptcp | Rainer Gerhards | 2010-08-10 | 1 | -1/+1 |
| | | | |/ | | | |/| | |||||
| | | * | | temporary bugfix replaced by permanent one for... | Rainer Gerhards | 2010-03-31 | 1 | -1/+1 |