Merge lp:~jameinel/launchpad/loggerhead-oops-742390 into lp:launchpad

Proposed by John A Meinel
Status: Merged
Approved by: William Grant
Approved revision: no longer in the source branch.
Merged at revision: 12664
Proposed branch: lp:~jameinel/launchpad/loggerhead-oops-742390
Merge into: lp:launchpad
Diff against target: 12 lines (+1/-1)
1 file modified
utilities/sourcedeps.conf (+1/-1)
To merge this branch: bzr merge lp:~jameinel/launchpad/loggerhead-oops-742390
Reviewer Review Type Date Requested Status
j.c.sackett (community) Approve
William Grant code* Approve
Review via email: mp+54858@code.launchpad.net

Commit message

[r=jcsackett,wgrant][bug=742390] Use newer loggerhead trunk, which restores compatibility with bzr 2.2

Description of the change

This fixes an OOPS regression in Loggerhead.
I would say we should run 'ec2land' but it doesn't run the loggerhead test suite anyway. So I think we can just 'lp-land' it, and get it rolled out into production soon.

wgrant has taught me the secrets to QA'ing the qastaging loggerhead, so I'll be happy to do that when it is available.

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) :
review: Approve (code*)
Revision history for this message
j.c.sackett (jcsackett) wrote :

Looks fine.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'utilities/sourcedeps.conf'
2--- utilities/sourcedeps.conf 2011-03-25 00:31:22 +0000
3+++ utilities/sourcedeps.conf 2011-03-25 13:19:12 +0000
4@@ -6,7 +6,7 @@
5 cscvs lp:~launchpad-pqm/launchpad-cscvs/devel;revno=432
6 dulwich lp:~launchpad-pqm/dulwich/devel;revno=424
7 difftacular lp:difftacular;revno=6
8-loggerhead lp:~loggerhead-team/loggerhead/trunk-rich;revno=442
9+loggerhead lp:~loggerhead-team/loggerhead/trunk-rich;revno=443
10 lpreview lp:~launchpad-pqm/bzr-lpreview/devel;revno=23
11 mailman lp:~launchpad-pqm/mailman/2.1;revno=976
12 old_xmlplus lp:~launchpad-pqm/dtdparser/trunk;revno=4