Rev 5619: Merge 2.2.4 into 2.3 in http://bazaar.launchpad.net/~vila/bzr/2.3-integration/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 5619 [merge]
revision-id: v.ladeuil+lp at free.fr-20110204141048-2jdghidt5u5uslc3
parent: pqm at pqm.ubuntu.com-20110203183614-vozstvm11thnt29g
parent: pqm at pqm.ubuntu.com-20110204121411-nh6ukc1ogrucz3r4
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 2.3.1-dev
timestamp: Fri 2011-02-04 15:10:48 +0100
message:
  Merge 2.2.4 into 2.3
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	2011-02-02 14:33:27 +0000
+++ b/doc/en/release-notes/bzr-2.2.txt	2011-02-04 14:10:48 +0000
@@ -8,13 +8,11 @@
 bzr 2.2.4
 #########
 
-:2.2.4: NOT RELEASED YET
-
-Compatibility Breaks
-********************
-
-New Features
-************
+:2.2.4: 2011-02-04
+
+This is a bugfix release. Only one bug has been fixed, a regression from 2.2.3
+involving only certain operations with launchpad. Upgrading is recommended for
+all users on earlier 2.2 releases.
 
 Bug Fixes
 *********
@@ -25,21 +23,6 @@
   the default instance was switched from edge to production in bzr 2.2.3.
   (Max Bowsher, #707075)
 
-Improvements
-************
-
-Documentation
-*************
-
-API Changes
-***********
-
-Internals
-*********
-
-Testing
-*******
-
 
 bzr 2.2.3
 #########

=== modified file 'doc/en/whats-new/whats-new-in-2.2.txt'
--- a/doc/en/whats-new/whats-new-in-2.2.txt	2011-01-20 18:42:20 +0000
+++ b/doc/en/whats-new/whats-new-in-2.2.txt	2011-02-04 14:10:48 +0000
@@ -35,6 +35,9 @@
 Bazaar 2.2.3 focused on fixes related to interactions with the launchpad
 server and python-2.7 compatibility.
 
+Bazaar 2.2.4 fixed a regression for some interactions with the launchpad
+server.
+
 See the :doc:`../release-notes/index` for details.
 
 Bazaar 2.2 is fully compatible both locally and on the network with 2.0