Merge branch 'v4-devel' into beta

3 files changed, 13 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 0ab127bb..55ca5b45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
 ---------------------------------------------------------------------------
-Version 4.5.2  [DEVEL] (rgerhards), 2009-07-??
+Version 4.5.2  [v4-beta] (rgerhards), 2009-08-21
 - legacy syslog parser changed so that it now accepts date stamps in
   wrong case. Some devices seem to create them and I do not see any harm
   in supporting that.
@@ -90,13 +90,14 @@ Version 4.5.0  [DEVEL] (rgerhards), 2009-07-02
   This could lead to timestamps written in the wrong format, but not to
   an abort
 ---------------------------------------------------------------------------
-Version 4.3.3  [beta] (rgerhards), 2009-0?-??
-- internal bugfix: object pointer was only reset to NULL when an object
-  was actually destructed. This most likely had no effect to existing code,
-  but it may also have caused trouble in remote cases. Similarly, the fix
-  may also cause trouble...
+Version 4.4.0  [v4-stable] (rgerhards), 2009-08-21
+- bugfix: stderr/stdout were not closed to be able to emit error messages,
+  but this caused ssh sessions to hang. Now we close them after the 
+  initial initialization. See forum thread:
+  http://kb.monitorware.com/controlling-terminal-issues-t9875.html
+- bugfix: sending syslog messages with zip compression did not work
 ---------------------------------------------------------------------------
-Version 4.3.2  [beta] (rgerhards), 2009-06-24
+Version 4.3.2  [v4-beta] (rgerhards), 2009-06-24
 - removed long-obsoleted property UxTradMsg
 - added a generic network stream server (in addition to rather specific
   syslog tcp server)
@@ -150,12 +151,15 @@ Version 4.3.0  [DEVEL] (rgerhards), 2009-04-17
   connection broke, but not if there was a problem with statement
   execution. The most probable case for such a case would be invalid
   sql inside the template, and this is now much easier to diagnose.
+<<<<<<< HEAD:ChangeLog
 ---------------------------------------------------------------------------
 Version 4.2.1  [v4-stable] (rgerhards), 2009-0?-??
 - bugfix: stderr/stdout were not closed to be able to emit error messages,
   but this caused ssh sessions to hang. Now we close them after the 
   initial initialization. See forum thread:
   http://kb.monitorware.com/controlling-terminal-issues-t9875.html
+=======
+>>>>>>> bd7542b51593739893922e8ec8fb6d7195d06cbe:ChangeLog
 ---------------------------------------------------------------------------
 Version 4.2.0  [v4-stable] (rgerhards), 2009-06-23
 - bugfix: light and full delay watermarks had invalid values, badly
diff --git a/configure.ac b/configure.ac
index 8709c25a..ab0c3a33 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],[4.5.1],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[4.5.2],[rsyslog@lists.adiscon.com])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([ChangeLog])
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/doc/manual.html b/doc/manual.html
index a563ebe5..96afb64d 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 4.5.1 (beta branch) of rsyslog.</b>
+<p><b>This documentation is for version 4.5.2 (v4-beta branch) of rsyslog.</b>
 Visit the <i><a href="http://www.rsyslog.com/doc-status.html">rsyslog status page</a></i></b>
 to obtain current version information and project status.
 </p><p><b>If you like rsyslog, you might