summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-08-20 12:37:19 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-08-20 12:37:19 +0200
commit8e408e9f532173c709c48f57c175cbd453fe8d5b (patch)
tree1e4a78e6abaf3de2d4a0c756c498e40abf8161d3
parentdababe8645af32f2fdbd386d04f0b5a7bc9d1743 (diff)
downloadrsyslog-8e408e9f532173c709c48f57c175cbd453fe8d5b.zip
rsyslog-8e408e9f532173c709c48f57c175cbd453fe8d5b.tar.gz
rsyslog-8e408e9f532173c709c48f57c175cbd453fe8d5b.tar.xz
preparing for 6.4.0 release
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac2
-rw-r--r--doc/manual.html2
3 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f40e3f2..eb975a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
---------------------------------------------------------------------------
-Version 6.3.13 [BETA] 2012-07-??
+Version 6.4.0 [BETA] 2012-08-20
+- THIS IS THE FIRST VERSION OF THE 6.4.x STABLE BRANCH
+ It includes all enhancements made in 6.3.x plus what is written in the
+ ChangeLog below.
- omelasticsearch: support for parameters parent & dynparent added
- bugfix: imtcp aborted when more than 2 connections were used.
Incremented pthread stack size to 4MB for imtcp, imptcp and imttcp
diff --git a/configure.ac b/configure.ac
index 8b5e3bd..92aeebc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
-AC_INIT([rsyslog],[6.3.12],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[6.4.0],[rsyslog@lists.adiscon.com])
AM_INIT_AUTOMAKE
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff --git a/doc/manual.html b/doc/manual.html
index 1266716..de05d7a 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -19,7 +19,7 @@ rsyslog support</a> available directly from the source!</p>
<p><b>Please visit the <a href="http://www.rsyslog.com/sponsors">rsyslog sponsor's page</a>
to honor the project sponsors or become one yourself!</b> We are very grateful for any help towards the
project goals.</p>
-<p><b>This documentation is for version 6.3.12 (beta branch) of rsyslog.</b>
+<p><b>This documentation is for version 6.4.0 (stable branch) of rsyslog.</b>
Visit the <i><a href="http://www.rsyslog.com/status">rsyslog status page</a></i></b>
to obtain current version information and project status.
</p><p><b>If you like rsyslog, you might