diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-12-07 15:14:49 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-12-07 15:14:49 +0100 |
| commit | 353bcab3beff4d42d2440c67b66874cc1e970995 (patch) | |
| tree | e9466fc112a9b943e79ab18f25eedf9dd9f506d6 | |
| parent | ada1fdfbaefd279da1c580b50b413234f793487b (diff) | |
| parent | 06764f3beda12b3f2bbb9f05d9ce1ba77cb2ddc8 (diff) | |
| download | rsyslog-353bcab3beff4d42d2440c67b66874cc1e970995.tar.gz rsyslog-353bcab3beff4d42d2440c67b66874cc1e970995.tar.bz2 rsyslog-353bcab3beff4d42d2440c67b66874cc1e970995.zip | |
Merge branch 'v7-stable'
Conflicts:
configure.ac
doc/manual.html
| -rw-r--r-- | ChangeLog | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -105,7 +105,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.4 [v7-stable] 2012-10-?? +Version 7.2.4 [v7-stable] 2012-12-07 - enhance: permit RFC3339 timestamp in local log socket messages Thanks to Sebastien Ponce for the patch. - imklog: added ParseKernelTimestamp parameter (import from 5.10.2) |