Update changelog for release
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1454549 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/main.distribution/doc/changelog.txt b/main.distribution/doc/changelog.txt
index 254b7bf..e3064f3 100644
--- a/main.distribution/doc/changelog.txt
+++ b/main.distribution/doc/changelog.txt
@@ -1,3 +1,9 @@
+Changes from 4.2.0 to 4.2.1
+---------------------------
+
+** Improvement
+ * Update to framework and main 4.2.1
+
Changes from 4.0.3 to 4.2.0
---------------------------
diff --git a/main.distribution/doc/changelog_framework.txt b/main.distribution/doc/changelog_framework.txt
index d61d3f8..a2af435 100644
--- a/main.distribution/doc/changelog_framework.txt
+++ b/main.distribution/doc/changelog_framework.txt
@@ -1,3 +1,16 @@
+Changes from 4.2.0 to 4.2.1
+---------------------------
+** Bug
+ * [FELIX-3411] - The implementation of org.osgi.service.startlevel.StartLevel#setStartLevel(int) does not follow the spec
+ * [FELIX-3893] - Bundle in cache doesn't pass security check anymore.
+ * [FELIX-3907] - NullPointerException in BundleWiringImpl when m_disposed is true.
+ * [FELIX-3939] - IllegalArgumentException from ClassLoader.definePackage
+ * [FELIX-3950] - Permission check being done even when security manager is absent
+ * [FELIX-3957] - Error events can be thrown when refreshing fragment bundles
+
+** Improvement
+ * [FELIX-3961] - Add a fallback to the default java security policy if no security provider is present
+
Changes from 4.0.3 to 4.2.0
---------------------------
** Bug