Prepare for release
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1663603 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/main.distribution/doc/changelog.txt b/main.distribution/doc/changelog.txt
index bc5c4d6..63592ec 100644
--- a/main.distribution/doc/changelog.txt
+++ b/main.distribution/doc/changelog.txt
@@ -1,10 +1,18 @@
+Changes from 4.6.0 to 4.6.1
+---------------------------
+
+** Improvement
+ * Update to framework and main 4.6.1
+
Changes from 4.4.1 to 4.6.0
---------------------------
+
** Improvement
* Update to framework and main 4.6.0
Changes from 4.4.0 to 4.4.1
---------------------------
+
** Improvement
* Update to latest framework and main version 4.4.1
* Update to latest obr version 2.0.2
@@ -12,6 +20,7 @@
Changes from 4.2.1 to 4.4.0
---------------------------
+
** Improvement
* Update to framework and main 4.4.0
diff --git a/main.distribution/doc/changelog_framework.txt b/main.distribution/doc/changelog_framework.txt
index 72e23b1..aecfed3 100644
--- a/main.distribution/doc/changelog_framework.txt
+++ b/main.distribution/doc/changelog_framework.txt
@@ -1,3 +1,11 @@
+Changes from 4.6.0 to 4.6.1
+---------------------------
+** Bug
+ * [FELIX-4806] - Ungetting service through ServiceObjects might throw IllegalArgumentException
+
+** Improvement
+ * [FELIX-4810] - Cache WeakZipFile#entries
+
Changes from 4.4.1 to 4.6.0
---------------------------
** Sub-task
diff --git a/main.distribution/doc/changelog_main.txt b/main.distribution/doc/changelog_main.txt
index 92929ab..01f402b 100644
--- a/main.distribution/doc/changelog_main.txt
+++ b/main.distribution/doc/changelog_main.txt
@@ -1,10 +1,18 @@
+Changes from 4.6.0 to 4.6.1
+---------------------------
+
+** Improvement
+ * Update to latest framework version 4.6.1
+
Changes from 4.4.1 to 4.6.0
---------------------------
+
** Improvement
* Update to latest framework version 4.6.0
Changes from 4.4.0 to 4.4.1
---------------------------
+
** Improvement
* Update to latest framework version 4.4.1
* Update to latest obr version 2.0.2
diff --git a/main.distribution/pom.xml b/main.distribution/pom.xml
index 4771c54..b31ac01 100644
--- a/main.distribution/pom.xml
+++ b/main.distribution/pom.xml
@@ -30,7 +30,7 @@
<version>4.7.0-SNAPSHOT</version>
<properties>
<dollar>$</dollar>
- <framework.version>4.7.0-SNAPSHOT</framework.version>
+ <framework.version>4.6.1</framework.version>
<gogo.runtime.version>0.12.1</gogo.runtime.version>
<gogo.shell.version>0.10.0</gogo.shell.version>
<gogo.command.version>0.14.0</gogo.command.version>