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

Proposed by Michael Hudson-Doyle on 2010-02-02
Status: Merged
Approved by: Michael Hudson-Doyle on 2010-02-02
Approved revision: not available
Merged at revision: not available
Proposed branch: lp:~mwhudson/launchpad/apply-fix-for-bug-513432
Merge into: lp:launchpad
Diff against target: 13 lines (+2/-1)
1 file modified
versions.cfg (+2/-1)
To merge this branch: bzr merge lp:~mwhudson/launchpad/apply-fix-for-bug-513432
Reviewer Review Type Date Requested Status
Francis J. Lacoste (community) release-critical 2010-02-02 Approve on 2010-02-02
Tim Penhey (community) 2010-02-02 Approve on 2010-02-02
Björn Tillenius 2010-02-02 Pending
Review via email: mp+18435@code.launchpad.net

Commit message

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

To post a comment you must log in.
Michael Hudson-Doyle (mwhudson) wrote :

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) wrote :

Bjorn, sorry about the spurious review request :/

Tim Penhey (thumper) wrote :

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) wrote :

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).

review: Approve (release-critical)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'versions.cfg'
2--- versions.cfg 2010-01-22 04:01:17 +0000
3+++ versions.cfg 2010-02-02 06:26:17 +0000
4@@ -9,7 +9,8 @@
5 # bzr export ampoule-0.1.0-lp-1.tar.gz lp:~launchpad/ampoule/launchpad-tweaked\
6 # -r 3
7 ampoule = 0.1.0-lp-1
8-bzr = 2.1b4
9+# Non-released bzr version from bzr+ssh://bazaar.launchpad.net/~mwhudson/bzr/2.1.0b4-lp2
10+bzr = 2.1b4-lp2
11 chameleon.core = 1.0b35
12 chameleon.zpt = 1.0b17
13 ClientForm = 0.2.10