summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-09-08 13:38:02 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2010-09-08 13:38:02 +0200
commit304ab88dd64b2ae46554fa5394aa8822194b1e95 (patch)
tree9185445b00199c1f486bcca51fddd6b252bf8dd3 /ChangeLog
parentd25f7d99f587ea20eb8d39ff6e2cffb6bdbc1c62 (diff)
parent947e5632039d1dd2ef3ae22ac45b17370bbac24d (diff)
downloadrsyslog-304ab88dd64b2ae46554fa5394aa8822194b1e95.tar.gz
rsyslog-304ab88dd64b2ae46554fa5394aa8822194b1e95.tar.xz
rsyslog-304ab88dd64b2ae46554fa5394aa8822194b1e95.zip
Merge branch 'v5-devel'
Conflicts: ChangeLog configure.ac
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog8
1 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 8dfc0527..ece51efc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
---------------------------------------------------------------------------
+Version 6.1.1 [DEVEL] (rgerhards), 2010-??-??
+- support for systemd officially added (import from 5.7.0)
+---------------------------------------------------------------------------
Version 6.1.0 [DEVEL] (rgerhards), 2010-08-12
*********************************** NOTE **********************************
@@ -15,6 +18,11 @@ expected that interfaces, even new ones, break during the initial
syslog plain tcp input plugin (NOT supporting TLS!)
[ported from v4]
---------------------------------------------------------------------------
+Version 5.7.0 [V5-DEVEL] (rgerhards), 2010-09-??
+- support for systemd officially added
+- acquire /dev/log socket optionally from systemd
+ thanks to Lennart Poettering for this patch
+---------------------------------------------------------------------------
Version 5.5.7 [V5-BETA] (rgerhards), 2010-08-09
- changed omudpspoof default spoof address to simplify typical use case
thanks to David Lang for suggesting this