Update changelog
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1674802 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/framework/doc/changelog.txt b/framework/doc/changelog.txt
index aecfed3..019d112 100644
--- a/framework/doc/changelog.txt
+++ b/framework/doc/changelog.txt
@@ -1,3 +1,15 @@
+Changes from 4.6.1 to 5.0.0
+---------------------------
+** Bug
+ * [FELIX-4838] - Deadlock in Service Registry
+ * [FELIX-4850] - org.osgi.framework.version should be 1.8
+ * [FELIX-4854] - Unable to create consistent wiring when same package is exported in same version by multiple bundles
+
+** Improvement
+ * [FELIX-4821] - Use a faster implementation for StringMap
+ * [FELIX-4845] - Clean up Logger implementation
+ * [FELIX-4525] - Refactor the Framework to use the Resolver module
+
Changes from 4.6.0 to 4.6.1
---------------------------
** Bug