Merge lp:~mwhudson/launchpad/apply-fix-for-bug-513432 into lp:launchpad

[Michael Hudson-Doyle]

Use a bzr that contains the fixes for bugs 514090 and 513432

[Michael Hudson-Doyle (mwhudson)]

Hi there,

This branch switches launchpad to using a custom bzr that contains fixes for the two linked bzr bugs (bug 514090 and bug 513432).

I'll be asking for a cherry pick for this change, so if you could remind me what the process is for that it would be great :-) -- I presume it's still a matter of pqm-submitting it to bzr+ssh://bazaar.launchpad.net/~launchpad-pqm/launchpad/production-devel and then ask a LOSA for the rollout?

[Michael Hudson-Doyle (mwhudson)]

Bjorn, sorry about the spurious review request :/

[Tim Penhey (thumper)]

Looks fine. Do we have a plan for 2.1 final? Do we know when it is released? I was under the impression that the "gold" status means frozen.

review: Approve

[Michael Hudson-Doyle (mwhudson)]

I have a branch that upgrades us to bzr 2.1rc1, but it's much too invasive a change to CP (yay bzr for incompatibly changing APIs between beta and release candidate).

[Francis J. Lacoste (flacoste)]

review: Approve (release-critical)

=== modified file 'versions.cfg'
--- versions.cfg	2010-01-22 04:01:17 +0000
+++ versions.cfg	2010-02-02 06:26:17 +0000
@@ -9,7 +9,8 @@
 # bzr export ampoule-0.1.0-lp-1.tar.gz lp:~launchpad/ampoule/launchpad-tweaked\
 #     -r 3
 ampoule = 0.1.0-lp-1
-bzr = 2.1b4
+# Non-released bzr version from bzr+ssh://bazaar.launchpad.net/~mwhudson/bzr/2.1.0b4-lp2
+bzr = 2.1b4-lp2
 chameleon.core = 1.0b35
 chameleon.zpt = 1.0b17
 ClientForm = 0.2.10