summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-09-30 11:24:28 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-09-30 11:24:28 +0200
commitd03fb1b9058a3e81c8d0ba72b916d514106567ed (patch)
tree4d1cce0ad5007f014990d1f7f23454add91f8411
parent4026000efcc736d1931785e4fa3c1fd21258fd95 (diff)
downloadrsyslog-d03fb1b9058a3e81c8d0ba72b916d514106567ed.tar.gz
rsyslog-d03fb1b9058a3e81c8d0ba72b916d514106567ed.tar.xz
rsyslog-d03fb1b9058a3e81c8d0ba72b916d514106567ed.zip
bumping version number (partial)
I am changing the way the version number is bumped so that viewer git merge conflicts happen. In the future, it will be bumped immediately before release and not immediately after (though this means I need to be more careful with interim versions).
-rw-r--r--ChangeLog2
-rw-r--r--doc/status.html14
2 files changed, 9 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 76791182..98950d52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
---------------------------------------------------------------------------
+Version 3.21.6 [DEVEL] (rgerhards), 2008-10-??
+---------------------------------------------------------------------------
Version 3.21.5 [DEVEL] (rgerhards), 2008-09-30
- performance optimization: unnecessary time() calls during message
parsing removed - thanks to David Lang for his excellent performance
diff --git a/doc/status.html b/doc/status.html
index cc82e698..ec3fbb48 100644
--- a/doc/status.html
+++ b/doc/status.html
@@ -2,19 +2,19 @@
<html><head><title>rsyslog status page</title></head>
<body>
<h2>rsyslog status page</h2>
-<p>This page reflects the status as of 2008-09-04.</p>
+<p>This page reflects the status as of 2008-09-30.</p>
<h2>Current Releases</h2>
-<p><b>development:</b> 3.21.4 [2008-09-04] -
-<a href="http://www.rsyslog.com/Article275.phtml">change log</a> -
-<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-130.phtml">download</a>
+<p><b>development:</b> 3.21.5 [2008-09-30] -
+<a href="http://www.rsyslog.com/Article279.phtml">change log</a> -
+<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-132.phtml">download</a>
-<br><b>beta:</b> 3.19.11 [2008-07-15] -
+<br><b>beta:</b> 3.19.11 [2008-08-25] -
<a href="http://www.rsyslog.com/Article273.phtml">change log</a> -
<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-129.phtml">download</a></p>
-<p><b>v3 stable:</b> 3.18.3 [2008-08-08] - <a href="http://www.rsyslog.com/Article271.phtml">change log</a> -
-<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-128.phtml">download</a>
+<p><b>v3 stable:</b> 3.18.4 [2008-09-18] - <a href="http://www.rsyslog.com/Article277.phtml">change log</a> -
+<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-131.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>