summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-07-18 16:33:41 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-07-18 16:33:41 +0200
commit8ed5da5dc4c3b146e4636dd8b44fe62df4d90c80 (patch)
treecf0e4ee34681b57b5aeca88d2f17e56ec612f804
parent71e4eebdf1f34c9fb10b3a8d7462ad624f740c10 (diff)
downloadrsyslog-8ed5da5dc4c3b146e4636dd8b44fe62df4d90c80.tar.gz
rsyslog-8ed5da5dc4c3b146e4636dd8b44fe62df4d90c80.tar.xz
rsyslog-8ed5da5dc4c3b146e4636dd8b44fe62df4d90c80.zip
preparing for 3.21.0 releasev3.21.0
-rw-r--r--ChangeLog7
-rw-r--r--doc/status.html10
-rw-r--r--tests/Makefile.am2
3 files changed, 10 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 1ef627fb..2df76ba9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,11 @@
---------------------------------------------------------------------------
-Version 3.21.0 [DEVEL] (rgerhards), 2008-??-??
+Version 3.21.0 [DEVEL] (rgerhards), 2008-07-18
+- starts a new devel branch
- added a generic test driver for RainerScript plus some test cases
to the testbench
-- added a samll diagnostic tool to obtain result of gethostname() API
+- added a small diagnostic tool to obtain result of gethostname() API
+- imported all changes from 3.18.1 until today (some quite important,
+ see below)
---------------------------------------------------------------------------
Version 3.19.11 [BETA] (rgerhards), 2008-??-??
---------------------------------------------------------------------------
diff --git a/doc/status.html b/doc/status.html
index f6b57eba..be012524 100644
--- a/doc/status.html
+++ b/doc/status.html
@@ -2,14 +2,12 @@
<html><head><title>rsyslog status page</title></head>
<body>
<h2>rsyslog status page</h2>
-<p>This page reflects the status as of 2008-07-15.</p>
+<p>This page reflects the status as of 2008-07-18.</p>
<h2>Current Releases</h2>
-<!-- no devel at this time!
-<p><b>development:</b> 3.19.9 [2008-07-07] -
-<a href="http://www.rsyslog.com/Article250.phtml">change log</a> -
-<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-117.phtml">download</a>
--->
+<p><b>development:</b> 3.21.0 [2008-07-18] -
+<a href="http://www.rsyslog.com/Article258.phtml">change log</a> -
+<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-121.phtml">download</a>
<br><b>beta:</b> 3.19.10 [2008-07-15] -
<a href="http://www.rsyslog.com/Article256.phtml">change log</a> -
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3ced4769..6057a7a8 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,7 +2,7 @@ check_PROGRAMS = rt_init rscript
TESTS = $(check_PROGRAMS)
test_files = testbench.h runtime-dummy.c
-EXTRA_DIST=*.rstest
+EXTRA_DIST=1.rstest 2.rstest err1.rstest
rt_init_SOURCES = rt-init.c $(test_files)
rt_init_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags) $(rsrt_cflags)