Release Preparation - Update changelog
Cosmetic fix
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@933987 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/core/doc/changelog.txt b/ipojo/core/doc/changelog.txt
index 5071bc9..6854256 100644
--- a/ipojo/core/doc/changelog.txt
+++ b/ipojo/core/doc/changelog.txt
@@ -1,3 +1,27 @@
+Changes from the 1.4.0 to 1.6.0
+-------------------------------
+** Bug
+ * [FELIX-1533] - Potential deadlock when stopping the underlying OSGi framework
+ * [FELIX-1965] - iPojo component is made available regardless of exception during validate
+ * [FELIX-2014] - Potential ClassCastException when a service property does not receive a value and is used in the constructor
+ * [FELIX-2019] - The Property value is 'null' in the Architecture description, while the value is well assigned to the component's field.
+ * [FELIX-2052] - Handler require callback are not called if the service (required) is registered before the instance of the handler has been started.
+ * [FELIX-2093] - iPOJO doesn't always use the correct class loader
+
+** Improvement
+ * [FELIX-1425] - Service Proxy Mode
+ * [FELIX-1426] - Service injection with Dynamic Proxies
+ * [FELIX-1427] - Service injection with Smart Proxies
+ * [FELIX-1532] - Be able to set the iPOJO Log Level from BND
+ * [FELIX-1741] - Allows the configuration handler description to retrieve the managed service PID
+ * [FELIX-1854] - Allows instances to directly declares service.* properties (pid, ranking, vendor, description)
+ * [FELIX-1885] - Ease CreationStrategy & iPOJOServiceFactory usage
+ * [FELIX-1906] - Allow calling a method when service properties of an already injected service are modified
+
+** New Feature
+ * [FELIX-2132] - Provides a way to control service exposition from the implementation class
+
+
Changes from 1.2.0 to 1.4.0
---------------------------
** Bug