diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-25 15:41:45 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-25 15:41:45 +0200 |
commit | de51fab0ff9647954fe6540ee77252e9ea317888 (patch) | |
tree | 09682f3e09c7d3768b9c66979a4d78796f59e5f4 /doc | |
parent | c7e8282b9eb9d6452f7678c3f7c1e06337a3bb0a (diff) | |
parent | 78bc40e1af312d076c4cc2225c9281b6725217f6 (diff) | |
download | rsyslog-de51fab0ff9647954fe6540ee77252e9ea317888.tar.gz rsyslog-de51fab0ff9647954fe6540ee77252e9ea317888.tar.xz rsyslog-de51fab0ff9647954fe6540ee77252e9ea317888.zip |
Merge branch 'master' into ultra-reliable
Conflicts:
tests/Makefile.am
Diffstat (limited to 'doc')
-rw-r--r-- | doc/status.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/status.html b/doc/status.html index c8608f73..4e8f1a5f 100644 --- a/doc/status.html +++ b/doc/status.html @@ -2,12 +2,12 @@ <html><head><title>rsyslog status page</title></head> <body> <h2>rsyslog status page</h2> -<p>This page reflects the status as of 2009-04-21.</p> +<p>This page reflects the status as of 2009-05-25.</p> <h2>Current Releases</h2> -<p><b>development:</b> 4.3.0 [2009-04-17] - -<a href="http://www.rsyslog.com/Article366.phtml">change log</a> - -<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-156.phtml">download</a> +<p><b>development:</b> 4.3.1 [2009-05-25] - +<a href="http://www.rsyslog.com/Article372.phtml">change log</a> - +<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-159.phtml">download</a> <br><b>beta:</b> 3.21.11 [2009-04-03] - <a href="http://www.rsyslog.com/Article358.phtml">change log</a> - |