diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-04-17 10:55:18 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-04-17 10:55:18 +0200 |
| commit | 9d59080b4a43ca6d19bece357cb1132374a2116a (patch) | |
| tree | 4ec0f74b0066e41c41ca58ef89e7e1cbfe37416c | |
| parent | 428e544db6e0c5909a76eb83b98825530aeb4b83 (diff) | |
| parent | adc8d626535c7c79d723ea2a84146b6c1856316f (diff) | |
| download | rsyslog-9d59080b4a43ca6d19bece357cb1132374a2116a.tar.gz rsyslog-9d59080b4a43ca6d19bece357cb1132374a2116a.tar.bz2 rsyslog-9d59080b4a43ca6d19bece357cb1132374a2116a.zip | |
Merge branch 'v7-stable'
Conflicts:
configure.ac
doc/manual.html
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -236,7 +236,7 @@ Version 7.3.0 [devel] 2012-10-09 This was achieved by somewhat reducing the robustness of the zip archive. This is controlled by the new action parameter "VeryReliableZip". ---------------------------------------------------------------------------- -Version 7.2.7 [v7-stable] 2013-03-?? +Version 7.2.7 [v7-stable] 2013-04-17 - rsyslogd startup information is now properly conveyed back to init when privileges are beging dropped Actually, we have moved termination of the parent in front of the diff --git a/configure.ac b/configure.ac index 3c5a1002..3fef0fa1 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.3.10],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[7.3.11],[rsyslog@lists.adiscon.com]) AM_INIT_AUTOMAKE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) |