Update changelog
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1507338 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scrplugin/maven-scr-plugin/changelog.txt b/scrplugin/maven-scr-plugin/changelog.txt
index 4542100..eb170ca 100644
--- a/scrplugin/maven-scr-plugin/changelog.txt
+++ b/scrplugin/maven-scr-plugin/changelog.txt
@@ -3,6 +3,7 @@
** Improvement
* [FELIX-4101] - Create metatype.properties file when description and label are inlined
* [FELIX-4126] - Discontinue creation of single XML descriptor files
+ * [FELIX-4170] - Deprecate inheritance of component descriptors
Changes from 1.13.0 to 1.12.0
diff --git a/scrplugin/scrtask/changelog.txt b/scrplugin/scrtask/changelog.txt
index 3b9a1e9..3c39c44 100644
--- a/scrplugin/scrtask/changelog.txt
+++ b/scrplugin/scrtask/changelog.txt
@@ -4,6 +4,7 @@
* [FELIX-4175] - scr.ant task does not provide scanClasses option
* [FELIX-4101] - Create metatype.properties file when description and label are inlined
* [FELIX-4126] - Discontinue creation of single XML descriptor files
+ * [FELIX-4170] - Deprecate inheritance of component descriptors
Changes from 1.7.0 to 1.6.0