Merge ~twom/launchpad:upgrade-loggerhead-to-r506 into launchpad:master

Proposed by Tom Wardill
Status: Merged
Approved by: Tom Wardill
Approved revision: f5327409c3f31dc882f6b70f940b17f87ee565d7
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~twom/launchpad:upgrade-loggerhead-to-r506
Merge into: launchpad:master
Diff against target: 26 lines (+3/-3)
2 files modified
utilities/sourcedeps.cache (+2/-2)
utilities/sourcedeps.conf (+1/-1)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+387207@code.launchpad.net

Commit message

Upgrade loggerhead to r506

Description of the change

Drop simplejson dependency
Fix viewing files at a given revision

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/utilities/sourcedeps.cache b/utilities/sourcedeps.cache
index cb372a9..ff07c4c 100644
--- a/utilities/sourcedeps.cache
+++ b/utilities/sourcedeps.cache
@@ -24,8 +24,8 @@
24 "cjwatson@canonical.com-20190614154330-091l9edcnubsjmsx"24 "cjwatson@canonical.com-20190614154330-091l9edcnubsjmsx"
25 ],25 ],
26 "loggerhead": [26 "loggerhead": [
27 504,27 506,
28 "cjwatson@canonical.com-20200708171643-74j4v5rykvonshqs"28 "cjwatson@canonical.com-20200710095850-o3aa6eo5a22jhuun"
29 ],29 ],
30 "pygettextpo": [30 "pygettextpo": [
31 25,31 25,
diff --git a/utilities/sourcedeps.conf b/utilities/sourcedeps.conf
index e1a993e..2377277 100644
--- a/utilities/sourcedeps.conf
+++ b/utilities/sourcedeps.conf
@@ -13,5 +13,5 @@ bzr-git lp:~launchpad-pqm/bzr-git/devel;revno=280
13bzr-svn lp:~launchpad-pqm/bzr-svn/devel;revno=272513bzr-svn lp:~launchpad-pqm/bzr-svn/devel;revno=2725
14cscvs lp:~launchpad-pqm/launchpad-cscvs/devel;revno=43314cscvs lp:~launchpad-pqm/launchpad-cscvs/devel;revno=433
15difftacular lp:~launchpad/difftacular/trunk;revno=1115difftacular lp:~launchpad/difftacular/trunk;revno=11
16loggerhead lp:~loggerhead-team/loggerhead/trunk-rich;revno=50416loggerhead lp:~loggerhead-team/loggerhead/trunk-rich;revno=506
17pygettextpo lp:~launchpad-pqm/pygettextpo/trunk;revno=2517pygettextpo lp:~launchpad-pqm/pygettextpo/trunk;revno=25

Subscribers

People subscribed via source and target branches

to status/vote changes: