Prepare for 1.2.1 release
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@692926 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/framework/doc/changelog.txt b/framework/doc/changelog.txt
index 038d42c..c96107e 100644
--- a/framework/doc/changelog.txt
+++ b/framework/doc/changelog.txt
@@ -1,3 +1,11 @@
+Changes from 1.2.0 to 1.2.1
+---------------------------
+
+* [2008-09-05] Fixed a performance regression that was caused by uncached
+ access to the bundle manifest headers. (FELIX-711)
+* [2008-09-03] Fixed a bug in calculating the system bundle's exported
+ packages which added a null export package.
+
Changes from 1.0.4 to 1.2.0
---------------------------