diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-14 18:31:03 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-14 18:31:03 +0200 |
| commit | 99b3a56e19e5cd799e602a449edc52a3378cf919 (patch) | |
| tree | 258cd2b6b7367940187872147ea54a159077e614 /ChangeLog | |
| parent | a201072a654e59dd8ac6ab21a29782bd85d6ddd7 (diff) | |
| parent | 50521ab72bcf302958b007ca77f08ce65a368fb8 (diff) | |
| download | rsyslog-99b3a56e19e5cd799e602a449edc52a3378cf919.tar.gz rsyslog-99b3a56e19e5cd799e602a449edc52a3378cf919.tar.xz rsyslog-99b3a56e19e5cd799e602a449edc52a3378cf919.zip | |
Merge branch 'v6-stable' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -197,7 +197,9 @@ Version 6.3.0 [DEVEL] (rgerhards), 2011-06-01 - introduced new config system http://blog.gerhards.net/2011/06/new-rsyslog-config-system-materializes.html --------------------------------------------------------------------------- -Version 6.2.2 [v6-stable], 2012-05-?? +Version 6.2.2 [v6-stable], 2012-06-13 +- build system improvements and spec file templates + Thanks to Abby Edwards for providing these enhancements - bugfix: disk queue was not persisted on shutdown, regression of fix to http://bugzilla.adiscon.com/show_bug.cgi?id=299 The new code also handles the case of shutdown of blocking light and |