summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-04-26 12:12:37 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2010-04-26 12:12:37 +0200
commit0944d4b5422b232daadfe4acc6a73c5e2e83c77b (patch)
tree51b0b9377ac5b13b05d319d4951364360a03fb11 /ChangeLog
parent7ef0821d4cc8582b01ab56d2fe304993186e40e7 (diff)
parentd19806431653e6575a002ab48206c16d3041e465 (diff)
downloadrsyslog-0944d4b5422b232daadfe4acc6a73c5e2e83c77b.tar.gz
rsyslog-0944d4b5422b232daadfe4acc6a73c5e2e83c77b.tar.xz
rsyslog-0944d4b5422b232daadfe4acc6a73c5e2e83c77b.zip
Merge branch 'v4-devel' into tmp
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog2
1 files changed, 2 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 76113d45..ee45417e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -418,6 +418,8 @@ increase.
output module interface
---------------------------------------------------------------------------
Version 4.7.2 [v4-devel] (rgerhards), 2010-04-??
+- added new $Sleep directive to hold processing for a couple of seconds
+ during startup
---------------------------------------------------------------------------
Version 4.7.1 [v4-devel] (rgerhards), 2010-04-22
- Solaris support much improved -- was not truely usable in 4.7.0