summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-06-16 12:01:40 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-06-16 12:01:40 +0200
commitd1c7f2c69afea3bd6dd242c5dd9acca4d09726a4 (patch)
tree4685d469de581908b6609e720e983a2a5366b83b
parent33e2d8063277d887f4a1b8f6929c0dfa0eadd955 (diff)
parentd040868f97fa92f1df31b2ac7ff835dc4f3c29be (diff)
downloadrsyslog-d1c7f2c69afea3bd6dd242c5dd9acca4d09726a4.tar.gz
rsyslog-d1c7f2c69afea3bd6dd242c5dd9acca4d09726a4.tar.xz
rsyslog-d1c7f2c69afea3bd6dd242c5dd9acca4d09726a4.zip
Merge branch 'beta'
Conflicts: ChangeLog configure.ac doc/manual.html
-rw-r--r--ChangeLog2
1 files changed, 1 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 332859c9..6d5c66cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -111,7 +111,7 @@ Version 3.19.0 (rgerhards), 2008-05-06
- -c option no longer must be the first option - thanks to varmjofekoj
for the patch
---------------------------------------------------------------------------
-Version 3.17.4 (rgerhards), 2008-05-??
+Version 3.17.4 (rgerhards), 2008-06-16
- changed default for $KlogSymbolLookup to "off". The directive is
also scheduled for removal in a later version. This was necessary
because on kernels >= 2.6, the kernel does the symbol lookup itself. The