summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-08-07 10:18:31 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-08-07 10:18:31 +0200
commitb761fbb0f0c9d5cf253ad3f58f7d8486b5650e85 (patch)
tree0b66cbb98ef49b4be716ce630cde258a96233eb5 /ChangeLog
parente39f202c75af187f96a1af07e60892a63e45cd3f (diff)
parent6f75d5460b12d6f57b3671d71d889747da0074cc (diff)
downloadrsyslog-b761fbb0f0c9d5cf253ad3f58f7d8486b5650e85.tar.gz
rsyslog-b761fbb0f0c9d5cf253ad3f58f7d8486b5650e85.tar.xz
rsyslog-b761fbb0f0c9d5cf253ad3f58f7d8486b5650e85.zip
Merge branch 'v2-stable' into v3-stable
Conflicts: ChangeLog doc/manual.html doc/rsyslog_conf.html omfwd.c
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f2ab6cb9..35d9d251 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
---------------------------------------------------------------------------
Version 3.18.2 (rgerhards), 2008-07-??
+- merged in IPv6 forwarding address bugfix from v2-stable
---------------------------------------------------------------------------
Version 3.18.1 (rgerhards), 2008-07-21
- bugfix: potential segfault in creating message mutex in non-direct queue
@@ -601,6 +602,11 @@ Version 3.10.0 (rgerhards), 2008-01-07
- much cleaner code due to new objects and removal of single-threading
mode
---------------------------------------------------------------------------
+Version 2.0.6 V2-STABLE (rgerhards), 2008-08-07
+- bugfix: IPv6 addresses could not be specified in forwarding actions
+ New syntax @[addr]:port introduced to enable that. Root problem was IPv6
+ addresses contain colons. (backport from 3.21.3)
+---------------------------------------------------------------------------
Version 2.0.5 STABLE (rgerhards), 2008-05-15
- bugfix: regular expressions inside property replacer did not work
properly