From f33b122e43a391338296841abcaab6bc00c9dc33 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards
Date: Thu, 6 Sep 2012 13:47:09 +0200
Subject: preparing for 7.1.0
---
ChangeLog | 4 +++-
configure.ac | 2 +-
doc/manual.html | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6bd82a0f..3a90803f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,10 @@
---------------------------------------------------------------------------
-Version 6.5.1 [devel] 2012-08-??
+Version 7.1.0 [devel] 2012-09-06
+- added support for hierarchical properties (CEE/lumberjack)
- added pure JSON output plugin parameter passing mode
- ommongodb now supports templates
- bugfix: imtcp could abort on exit due to invalid free()
+- imported bugfixes from 6.4.1
---------------------------------------------------------------------------
Version 6.5.0 [devel] 2012-08-28
- imrelp now supports non-cancel thread termination
diff --git a/configure.ac b/configure.ac
index 1d7aec58..25f6ab46 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],[6.5.0],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[7.1.0],[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 9a8644c9..58b270f9 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -19,7 +19,7 @@ rsyslog support available directly from the source!
Please visit the rsyslog sponsor's page
to honor the project sponsors or become one yourself! We are very grateful for any help towards the
project goals.
-This documentation is for version 6.5.0 (devel branch) of rsyslog.
+
This documentation is for version 7.1.0 (devel branch) of rsyslog.
Visit the rsyslog status page
to obtain current version information and project status.
If you like rsyslog, you might
--
cgit v1.2.3