summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-05-03 14:48:24 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2010-05-03 14:48:24 +0200
commitaa31459b15981c00f0e4807e0565ecdcc3f6bf6c (patch)
tree714672c691220ee9e9fa75ea3381cad9fefc02bb
parent315288a4c07965f9320dba9d357ba136f6e47282 (diff)
parent1ab2bb26d20eaffc36999cb2bb1d7c9be3994c56 (diff)
downloadrsyslog-aa31459b15981c00f0e4807e0565ecdcc3f6bf6c.tar.gz
rsyslog-aa31459b15981c00f0e4807e0565ecdcc3f6bf6c.tar.xz
rsyslog-aa31459b15981c00f0e4807e0565ecdcc3f6bf6c.zip
Merge branch 'v4-devel'v5.5.4
Conflicts: ChangeLog configure.ac doc/manual.html
-rw-r--r--ChangeLog2
1 files changed, 1 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e8793df7..c17ede37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -429,7 +429,7 @@ increase.
- increased ompgsql performance by adapting to new transactional
output module interface
---------------------------------------------------------------------------
-Version 4.7.2 [v4-devel] (rgerhards), 2010-04-??
+Version 4.7.2 [v4-devel] (rgerhards), 2010-05-03
- bugfix: problems with atomic operations emulaton
replaced atomic operation emulation with new code. The previous code
seemed to have some issue and also limited concurrency severely. The