Rev 5552: Merge 2.2 into trunk in http://bazaar.launchpad.net/~vila/bzr/integration/

[Vincent Ladeuil]

At http://bazaar.launchpad.net/~vila/bzr/integration/

------------------------------------------------------------
revno: 5552 [merge]
revision-id: v.ladeuil+lp at free.fr-20101126155720-56dkklxupi8t51et
parent: pqm at pqm.ubuntu.com-20101124180929-wxyctfo7dlfa0las
parent: pqm at pqm.ubuntu.com-20101125171604-cdf3nkm0ps1zn790
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Fri 2010-11-26 16:57:20 +0100
message:
  Merge 2.2 into trunk
modified:
  doc/en/release-notes/bzr-2.2.txt bzr2.2.txt-20101008081016-21wd86gpfhllpue3-39
  doc/en/whats-new/whats-new-in-2.2.txt whatsnewin2.2.txt-20100304041442-cj7jdn23zakcw08l-1
-------------- next part --------------
=== modified file 'doc/en/release-notes/bzr-2.2.txt'
--- a/doc/en/release-notes/bzr-2.2.txt	2010-11-10 02:01:33 +0000
+++ b/doc/en/release-notes/bzr-2.2.txt	2010-11-26 15:57:20 +0000
@@ -8,10 +8,10 @@
 bzr 2.2.2
 #########
 
-:2.2.2: NOT RELEASED YET
+:2.2.2: 2010-11-25
 
-Compatibility Breaks
-********************
+This is a bugfix release. None of these bugfixes are critical, but upgrading
+is recommended for all users on earlier 2.2 releases.
 
 New Features
 ************
@@ -49,17 +49,8 @@
   installed.
   (Martin [gz], Gary van der Merwe, #632465)
 
-Improvements
-************
-
-Documentation
-*************
-
-API Changes
-***********
-
-Internals
-*********
+* Close leaked socket to SSH subprocesses, which caused dput sftp uploads
+  to hang.  (Max Bowsher, #659590)
 
 Testing
 *******

=== modified file 'doc/en/whats-new/whats-new-in-2.2.txt'
--- a/doc/en/whats-new/whats-new-in-2.2.txt	2010-11-04 13:46:02 +0000
+++ b/doc/en/whats-new/whats-new-in-2.2.txt	2010-11-25 15:56:20 +0000
@@ -27,6 +27,11 @@
 
 See the :doc:`../release-notes/index` for details.
 
+Bazaar 2.2.2 focused on fixes to improve our Ubuntu release workflow (which
+should also help all other distributions).
+
+See the :doc:`../release-notes/index` for details.
+
 Bazaar 2.2 is fully compatible both locally and on the network with 2.0
 and 2.1, and can read and write repositories generated by all previous
 versions.