summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-12-05 14:39:22 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2008-12-05 14:39:22 +0100
commit8b7649fcda9eb15951dcad7728220228b7e29303 (patch)
tree4ec816e2addf74af8ea4f6e906a32ddde96ab0d7
parent85c85c1496856307a0080150176842e9a480a5a3 (diff)
downloadrsyslog-4.1.2.zip
rsyslog-4.1.2.tar.gz
rsyslog-4.1.2.tar.xz
preparing for 4.1.2 releasev4.1.2
-rw-r--r--ChangeLog4
-rw-r--r--doc/status.html16
2 files changed, 10 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index d60e6f7..c6bc46d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,3 @@
-- doc bugfix: typo in v3 compatibility document
- thanks to Andrej for reporting
---------------------------------------------------------------------------
Version 4.1.2 [DEVEL] (rgerhards), 2008-12-04
- bugfix: code did not compile without zlib
@@ -12,6 +10,8 @@ Version 4.1.2 [DEVEL] (rgerhards), 2008-12-04
emitted only once in a minute (this currently is a hard-coded limit,
if someone comes up with a good reason to make it configurable, we
will probably do that).
+- doc bugfix: typo in v3 compatibility document directive syntax
+ thanks to Andrej for reporting
- imported other changes from 3.21.8 and 3.20.1 (see there)
---------------------------------------------------------------------------
Version 4.1.1 [DEVEL] (rgerhards), 2008-11-26
diff --git a/doc/status.html b/doc/status.html
index b814d0b..7469428 100644
--- a/doc/status.html
+++ b/doc/status.html
@@ -5,16 +5,16 @@
<p>This page reflects the status as of 2008-11-26.</p>
<h2>Current Releases</h2>
-<p><b>development:</b> 4.1.1 [2008-11-26] -
-<a href="http://www.rsyslog.com/Article317.phtml">change log</a> -
-<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-140.phtml">download</a>
+<p><b>development:</b> 4.1.2 [2008-12-05] -
+<a href="http://www.rsyslog.com/Article331.phtml">change log</a> -
+<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-143.phtml">download</a>
-<br><b>beta:</b> 3.21.7 [2008-11-11] -
-<a href="http://www.rsyslog.com/Article305.phtml">change log</a> -
-<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-138.phtml">download</a></p>
+<br><b>beta:</b> 3.21.9 [2008-12-04] -
+<a href="http://www.rsyslog.com/Article330.phtml">change log</a> -
+<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-142.phtml">download</a></p>
-<p><b>v3 stable:</b> 3.20.0 [2008-11-05] - <a href="http://www.rsyslog.com/Article302.phtml">change log</a> -
-<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-137.phtml">download</a>
+<p><b>v3 stable:</b> 3.20.2 [2008-12-04] - <a href="http://www.rsyslog.com/Article329.phtml">change log</a> -
+<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-141.phtml">download</a>
<br><b>v2 stable:</b> 2.0.6 [2008-08-07] - <a href="http://www.rsyslog.com/Article266.phtml">change log</a> -
<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-125.phtml">download</a>