summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-04-24 14:15:15 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-04-24 14:15:15 +0200
commitca14951cd3caece93a0ad9d678c5dce8e26fd869 (patch)
treecf74808ffa692ff005820cc5d267784c13f2d6f2
parentc5178a4d21cf8ca3362b8a8394d0e762801550a4 (diff)
parent28516a1b745d1d078681a063b71637dd45306712 (diff)
downloadrsyslog-ca14951cd3caece93a0ad9d678c5dce8e26fd869.tar.gz
rsyslog-ca14951cd3caece93a0ad9d678c5dce8e26fd869.tar.xz
rsyslog-ca14951cd3caece93a0ad9d678c5dce8e26fd869.zip
Merge branch 'v3-stable' into beta
Conflicts: doc/manual.html
-rw-r--r--ChangeLog2
1 files changed, 1 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8735ed71..c376f383 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -52,7 +52,7 @@ Version 3.17.0 (rgerhards), 2008-04-08
Plus a number of bugfixes that were applied to v3-stable and beta
branches (not mentioned here in detail).
---------------------------------------------------------------------------
-Version 3.16.0 (rgerhards), 2008-04-??
+Version 3.16.0 (rgerhards), 2008-04-24
- new v3-stable (3.16.x) based on beta 3.15.x (RELP support)
- bugfix: omsnmp had a too-small sized buffer for hostname+port. This
could not lead to a segfault, as snprintf() was used, but could cause