Update changelog for release
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@986903 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/framework.security/doc/changelog.txt b/framework.security/doc/changelog.txt
index d59c9a6..db77a2a 100644
--- a/framework.security/doc/changelog.txt
+++ b/framework.security/doc/changelog.txt
@@ -1,5 +1,13 @@
+Changes from 1.2.0 to 1.4.0
+---------------------------
+
+** Improvement
+ * [FELIX-2547] - Implement conditionalpermissioninfo encoding/decoding to match the spec.
+
+
Changes from 1.0.0 to 1.2.0
---------------------------
+
** Task
* [FELIX-2294] - Patch Framework Security for compatibility