Update changelog files
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@734726 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/composite/doc/changelog.txt b/ipojo/composite/doc/changelog.txt
index 6dd301c..63ee888 100644
--- a/ipojo/composite/doc/changelog.txt
+++ b/ipojo/composite/doc/changelog.txt
@@ -1,16 +1,22 @@
+Changes from 1.0.0 to 1.2.0
+---------------------------
+** Bug
+ * [FELIX-797] - Composite Architecture contains duplicate instances
+ * [FELIX-817] - iPOJO Service Exported throw an error when stopping
+
Changes from 0.8.1 to 1.0.0
---------------------------
** Bug
- * [FELIX-622] - iPOJO Composite Service Instance can use factories twice to create service instance (2008-07-03)
- * [FELIX-628] - Architecture service should not publish the instance.name property (2008-07-08)
- * [FELIX-637] - Composite service implementation does not support long argument (2008-07-17)
+ * [FELIX-622] - iPOJO Composite Service Instance can use factories twice to create service instance
+ * [FELIX-628] - Architecture service should not publish the instance.name property
+ * [FELIX-637] - Composite service implementation does not support long argument
** Improvement
- * [FELIX-673] - Provide OBR description to iPOJO bundles (2008-08-07)
- * [FELIX-688] - Better error reporting when an instance creation failed (2008-08-20)
- * [FELIX-689] - Instance 'name' property should become 'instance.name' (2008-08-20)
- * [FELIX-716] - Provide XML schemas for iPOJO descriptors (2008-09-09)
+ * [FELIX-673] - Provide OBR description to iPOJO bundles
+ * [FELIX-688] - Better error reporting when an instance creation failed
+ * [FELIX-689] - Instance 'name' property should become 'instance.name'
+ * [FELIX-716] - Provide XML schemas for iPOJO descriptors
Version 0.8.1
-------------
- * Initial release (2008-06-06)
+ * Initial release