Launchpad itself

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

  1. Git
  2. lp:~twom/launchpad
  3. upgrade-loggerhead-to-r506
  4. Merge into 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
1diff --git a/utilities/sourcedeps.cache b/utilities/sourcedeps.cache
2index cb372a9..ff07c4c 100644
3--- a/utilities/sourcedeps.cache
4+++ b/utilities/sourcedeps.cache
5@@ -24,8 +24,8 @@
6 "cjwatson@canonical.com-20190614154330-091l9edcnubsjmsx"
7 ],
8 "loggerhead": [
9- 504,
10- "cjwatson@canonical.com-20200708171643-74j4v5rykvonshqs"
11+ 506,
12+ "cjwatson@canonical.com-20200710095850-o3aa6eo5a22jhuun"
13 ],
14 "pygettextpo": [
15 25,
16diff --git a/utilities/sourcedeps.conf b/utilities/sourcedeps.conf
17index e1a993e..2377277 100644
18--- a/utilities/sourcedeps.conf
19+++ b/utilities/sourcedeps.conf
20@@ -13,5 +13,5 @@ bzr-git lp:~launchpad-pqm/bzr-git/devel;revno=280
21 bzr-svn lp:~launchpad-pqm/bzr-svn/devel;revno=2725
22 cscvs lp:~launchpad-pqm/launchpad-cscvs/devel;revno=433
23 difftacular lp:~launchpad/difftacular/trunk;revno=11
24-loggerhead lp:~loggerhead-team/loggerhead/trunk-rich;revno=504
25+loggerhead lp:~loggerhead-team/loggerhead/trunk-rich;revno=506
26 pygettextpo lp:~launchpad-pqm/pygettextpo/trunk;revno=25

Subscribers

People subscribed via source and target branches

to status/vote changes: