Merge lp:~mwhudson/launchpad/bzr-2.1-gold into lp:launchpad

Proposed by Michael Hudson-Doyle
Status: Merged
Approved by: Michael Hudson-Doyle
Approved revision: not available
Merged at revision: not available
Proposed branch: lp:~mwhudson/launchpad/bzr-2.1-gold
Merge into: lp:launchpad
Diff against target: 13 lines (+1/-2)
1 file modified
versions.cfg (+1/-2)
To merge this branch: bzr merge lp:~mwhudson/launchpad/bzr-2.1-gold
Reviewer Review Type Date Requested Status
Tim Penhey (community) Approve
Review via email: mp+19679@code.launchpad.net

Commit message

Upgrade to bzr 2.1 final

To post a comment you must log in.
Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

Upgrade to bzr 2.1 final.

I checked, and 2.1 final includes both the bugfixes we'd CPed onto 2.1rc2.

Revision history for this message
Tim Penhey (thumper) wrote :

Yay bzr 2.1 \o/

review: Approve

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-02-04 00:29:49 +0000
3+++ versions.cfg 2010-02-21 19:18:18 +0000
4@@ -5,8 +5,7 @@
5 # Alphabetical, case-insensitive, please! :-)
6
7 ampoule = 0.2.0
8-# From lp:~mwhudson/bzr/bzr-2.1.0rc2-lp-1 ('make dist' from r4807)
9-bzr = 2.1.0rc2-lp-1
10+bzr = 2.1.0
11 chameleon.core = 1.0b35
12 chameleon.zpt = 1.0b17
13 ClientForm = 0.2.10