Merge lp:~salgado/launchpad/update-to-latest-c-i-p into lp:launchpad

Proposed by Guilherme Salgado
Status: Merged
Merged at revision: not available
Proposed branch: lp:~salgado/launchpad/update-to-latest-c-i-p
Merge into: lp:launchpad
Diff against target: 10 lines (+1/-1)
1 file modified
utilities/sourcedeps.conf (+1/-1)
To merge this branch: bzr merge lp:~salgado/launchpad/update-to-latest-c-i-p
Reviewer Review Type Date Requested Status
Michael Nelson (community) code Approve
Review via email: mp+19604@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Guilherme Salgado (salgado) wrote :

Update sourcedeps.conf to use the latest rev from c-i-p, which will be needed in order for me to land my lp-as-openid-rp branch.

Revision history for this message
Michael Nelson (michael.nelson) :
review: Approve (code)

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 2010-02-02 17:48:25 +0000
3+++ utilities/sourcedeps.conf 2010-02-18 13:57:17 +0000
4@@ -15,5 +15,5 @@
5 subunit lp:~launchpad-pqm/subunit/trunk;revno=61
6 subvertpy lp:~launchpad-pqm/subvertpy/trunk;revno=2040
7 testresources lp:~launchpad-pqm/testresources/dev;revno=16
8-canonical-identity-provider lp:~launchpad-pqm/canonical-identity-provider/trunk;revno=8901 optional
9+canonical-identity-provider lp:~launchpad-pqm/canonical-identity-provider/trunk;revno=8903 optional
10 shipit lp:~launchpad-pqm/shipit/trunk;revno=8901 optional