Merge lp:~cjwatson/launchpad/upgrade-pygments into lp:launchpad

Proposed by Colin Watson
Status: Merged
Merged at revision: 18560
Proposed branch: lp:~cjwatson/launchpad/upgrade-pygments
Merge into: lp:launchpad
Diff against target: 27 lines (+3/-3)
2 files modified
utilities/sourcedeps.cache (+2/-2)
utilities/sourcedeps.conf (+1/-1)
To merge this branch: bzr merge lp:~cjwatson/launchpad/upgrade-pygments
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+338476@code.launchpad.net

Commit message

Upgrade loggerhead to r492, including support for Pygments 2.2.0.

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

Rubber-stamping since the underlying loggerhead revisions have all been individually reviewed.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'utilities/sourcedeps.cache'
2--- utilities/sourcedeps.cache 2017-12-22 09:59:33 +0000
3+++ utilities/sourcedeps.cache 2018-02-21 22:30:52 +0000
4@@ -24,8 +24,8 @@
5 "aaron@aaronbentley.com-20100715135013-uoi3q430urx9gwb8"
6 ],
7 "loggerhead": [
8- 490,
9- "william.grant@canonical.com-20160330070547-bbi1jc0pe6mqlquz"
10+ 492,
11+ "cjwatson@canonical.com-20180221151136-cfapvzjpo8px3cue"
12 ],
13 "lpreview": [
14 23,
15
16=== modified file 'utilities/sourcedeps.conf'
17--- utilities/sourcedeps.conf 2017-12-22 09:59:33 +0000
18+++ utilities/sourcedeps.conf 2018-02-21 22:30:52 +0000
19@@ -13,7 +13,7 @@
20 bzr-svn lp:~launchpad-pqm/bzr-svn/devel;revno=2725
21 cscvs lp:~launchpad-pqm/launchpad-cscvs/devel;revno=433
22 difftacular lp:~launchpad/difftacular/trunk;revno=6
23-loggerhead lp:~loggerhead-team/loggerhead/trunk-rich;revno=490
24+loggerhead lp:~loggerhead-team/loggerhead/trunk-rich;revno=492
25 lpreview lp:~launchpad-pqm/bzr-lpreview/devel;revno=23
26 mailman lp:~launchpad-pqm/mailman/2.1;revno=977
27 old_xmlplus lp:~launchpad-pqm/dtdparser/trunk;revno=4