Launchpad itself

Merge lp:~cjwatson/launchpad/update-contributions into lp:launchpad

  1. update-contributions
  2. Merge into devel
Proposed by Colin Watson
Status: Merged
Merged at revision: 18017
Proposed branch: lp:~cjwatson/launchpad/update-contributions
Merge into: lp:launchpad
Diff against target: 64 lines (+13/-4)
1 file modified
utilities/community-contributions.py (+13/-4)
To merge this branch: bzr merge lp:~cjwatson/launchpad/update-contributions
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+293612@code.launchpad.net

Commit message

Add Kit to known_canonical_lp_devs; add Iain and Vincent to known_canonical_non_lp_devs, and sort; merge a few more identities.

Description of the change

Add Kit to known_canonical_lp_devs; add Iain and Vincent to known_canonical_non_lp_devs, and sort; merge a few more identities.

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'utilities/community-contributions.py'
2--- utilities/community-contributions.py 2015-01-05 08:20:33 +0000
3+++ utilities/community-contributions.py 2016-05-03 12:25:45 +0000
4@@ -1,7 +1,7 @@
5 #!/usr/bin/python
6 # -*- coding: utf-8 -*-
7 #
8-# Copyright 2009 Canonical Ltd. This software is licensed under the
9+# Copyright 2009-2016 Canonical Ltd. This software is licensed under the
10 # GNU Affero General Public License version 3 (see the file LICENSE).
11
12 """Show what Launchpad community contributors have done.
13@@ -164,6 +164,7 @@
14 u'jonathan.knowles {_AT_} canonical.com',
15 u'Julian Edwards',
16 u'Karl Fogel',
17+ u'Kit Randel',
18 u'Launch Pad',
19 u'Launchpad APA',
20 u'Launchpad Developers',
21@@ -217,15 +218,19 @@
22 [wiki_encode(x) for x in (u'Adam Conrad',
23 u'Andrew Bennetts',
24 u'Anthony Lenton',
25+ u'Chris Johnston',
26 u'Cody Somerville',
27 u'Cody A.W. Somerville',
28 u'David Murphy',
29 u'Didier Roche',
30+ u'Dustin Kirkland',
31 u'Elliot Murphy',
32 u'Gabriel Neuman gneuman {_AT_} async.com',
33 u'Gustavo Niemeyer',
34+ u'Iain Lane',
35 u'James Henstridge',
36 u'James Westby',
37+ u'John Arbash Meinel',
38 u'John Lenton',
39 u'Kees Cook',
40 u'LaMont Jones',
41@@ -238,9 +243,7 @@
42 u'Michael Vogt',
43 u'Sidnei da Silva',
44 u'Steve Langasek',
45- u'Dustin Kirkland',
46- u'John Arbash Meinel',
47- u'Chris Johnston',
48+ u'Vincent Ladeuil',
49 )]
50
51 # Some people have made commits using various names and/or email
52@@ -300,6 +303,12 @@
53 u'Andrea Corbellini <andrea.corbellini {_AT_} beeseek.org>'),
54 (u'Luke Faraone <luke {_AT_} faraone.cc',
55 u'Luke Faraone <luke {_AT_} faraone.cc>'),
56+ (u'cjwatson {_AT_} chiark.greenend.org.uk',
57+ u'Colin Watson <cjwatson {_AT_} canonical.com'),
58+ (u'Kit Randel <kit {_AT_} nocturne.net.nz>',
59+ u'Kit Randel <kit.randel {_AT_} canonical.com>'),
60+ (u'william.grant {_AT_} canonical.com',
61+ u'William Grant <william.grant {_AT_} canonical.com>'),
62 )
63 # Then put it in dictionary form with the correct encodings.
64 merge_names_map = dict((wiki_encode(a), wiki_encode(b))