Updates for a releasev2.2.22

3 files changed, 18 insertions, 1 deletions

diff --git a/NEWS b/NEWS
index 10df908c2..1d1136f16 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 News (mainly features/major bug fixes)
 
+portage-2.2.22
+-------------
+* Stage 1 of the repoman re-write code merged in to master branch
+  This is the first release of the new code base.
+
+
 portage-2.2.19
 -------------
 * The squashdelta sync module was removed for separate installation
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index e54892bb8..b26ba208e 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,6 +1,16 @@
 Release Notes; upgrade information mainly.
 Features/major bugfixes are listed in NEWS
 
+portage-2.2.22
+==================================
+* Bug Fixes:
+    - Bug 559636 repoman: ignore unadded files when possible
+    - Bug 510840 repoman: Remove profiles TODO comment
+    - Bug 561234 SyncManager.async: initialize attributes before fork
+    - Bug 561240 repository/config.py: Fix propogation of module_specific_options
+* First release of the repoman re-write code (stage 1)
+
+
 portage-2.2.21
 ==================================
 * Bug Fixes:
@@ -28,6 +38,7 @@ portage-2.2.21
     - Bug 560466 match_from_list: restrict =* to match only on version part boundaries
 * git sync: Respect PORTAGE_QUIET
 * several man page updates
+* rsync: per repo repos.conf rsync options via the 'sync-rsync-extra-opts' option
 
 
 portage-2.2.20.1
diff --git a/setup.py b/setup.py
index 3a1a32110..ec43cfdb0 100755
--- a/setup.py
+++ b/setup.py
@@ -612,7 +612,7 @@ def get_manpages():
 
 setup(
 	name = 'portage',
-	version = '2.2.21',
+	version = '2.2.22',
 	url = 'https://wiki.gentoo.org/wiki/Project:Portage',
 	author = 'Gentoo Portage Development Team',
 	author_email = 'dev-portage@gentoo.org',