commit 4fbd8e40a6206bffa8ead08fb460fe251e1da0e6
author Carsten Ziegeler <cziegeler@apache.org> Thu Aug 21 09:38:18 2014 +0000
committer Carsten Ziegeler <cziegeler@apache.org> Thu Aug 21 09:38:18 2014 +0000
tree 2a5a2f35808676d851a081f9a0258883f31aa758
parent 3b107460f09622839f6c99796b79cbcd8f44e805

FELIX-4608 : Merge Performance IT into Event Admin. Apply patch from Bob Paulin

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1619326 13f79535-47bb-0310-9956-ffa450edef68

eventadmin/impl/changelog.txt

diff --git a/eventadmin/impl/changelog.txt b/eventadmin/impl/changelog.txt
index 2fdf46e..3a30916 100644
--- a/eventadmin/impl/changelog.txt
+++ b/eventadmin/impl/changelog.txt
@@ -1,6 +1,7 @@
-Changes from 1.3.2 to 1.3.4
+Changes from 1.3.2 to 1.4.0
 ---------------------------
 ** Improvement
+    * [FELIX-4608] - Merge Performance IT into Event Admin
     * [FELIX-4604] - Add a configuration to ignore certain events
     * [FELIX-3511] - Use java.concurrent from Java 6
     * [FELIX-4316] - Packages imported dynamically should also be imported statically with an optional flag