summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-09-30 11:24:28 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-09-30 11:24:28 +0200
commitd03fb1b9058a3e81c8d0ba72b916d514106567ed (patch)
tree4d1cce0ad5007f014990d1f7f23454add91f8411 /ChangeLog
parent4026000efcc736d1931785e4fa3c1fd21258fd95 (diff)
downloadrsyslog-d03fb1b9058a3e81c8d0ba72b916d514106567ed.tar.gz
rsyslog-d03fb1b9058a3e81c8d0ba72b916d514106567ed.tar.xz
rsyslog-d03fb1b9058a3e81c8d0ba72b916d514106567ed.zip
bumping version number (partial)
I am changing the way the version number is bumped so that viewer git merge conflicts happen. In the future, it will be bumped immediately before release and not immediately after (though this means I need to be more careful with interim versions).
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog2
1 files changed, 2 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 76791182..98950d52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
---------------------------------------------------------------------------
+Version 3.21.6 [DEVEL] (rgerhards), 2008-10-??
+---------------------------------------------------------------------------
Version 3.21.5 [DEVEL] (rgerhards), 2008-09-30
- performance optimization: unnecessary time() calls during message
parsing removed - thanks to David Lang for his excellent performance