summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-10-18 14:34:54 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-10-18 14:34:54 +0200
commit9a9c88a31abd139889bacee0f58b949c278ffdb2 (patch)
tree740c0fc2f421e4198821afc06630b4731d06cde4
parentc96bc325ace9db91c909606b68e0347de98b0bd2 (diff)
downloadrsyslog-9a9c88a31abd139889bacee0f58b949c278ffdb2.tar.gz
rsyslog-9a9c88a31abd139889bacee0f58b949c278ffdb2.tar.xz
rsyslog-9a9c88a31abd139889bacee0f58b949c278ffdb2.zip
preparing for 7.1.12 release
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac2
-rw-r--r--doc/manual.html2
3 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 25ecdcc2..4e481a25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
----------------------------------------------------------------------------
-Version 7.1.12 [beta] 2012-10-??
+Version 7.1.12 [beta] 2012-10-18
- minor updates to better support newer systemd developments
Thanks to Michael Biebl for the patches.
+- build system cleanup
+ Thanks to Michael Biebl for the patch series.
- cleanup: removed remains of -c option (compatibility mode)
both from code & doc and emitted warning message if still used
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=361
diff --git a/configure.ac b/configure.ac
index 6aa12395..3c5b6764 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],[7.1.11],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[7.1.12],[rsyslog@lists.adiscon.com])
AM_INIT_AUTOMAKE
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff --git a/doc/manual.html b/doc/manual.html
index cfad1a6a..45ba771b 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 7.1.11 (beta branch) of rsyslog.</b>
+<p><b>This documentation is for version 7.1.12 (beta branch) of rsyslog.</b>
Visit the <i><a href="http://www.rsyslog.com/status">rsyslog status page</a></i></b>
to obtain current version information and project status.
</p><p><b>If you like rsyslog, you might