Merge lp:~xnox/udd/trusty into lp:udd

Proposed by Dimitri John Ledkov
Status: Merged
Merged at revision: 637
Proposed branch: lp:~xnox/udd/trusty
Merge into: lp:udd
Diff against target: 34 lines (+4/-4)
1 file modified
udd/icommon.py (+4/-4)
To merge this branch: bzr merge lp:~xnox/udd/trusty
Reviewer Review Type Date Requested Status
James Westby Approve
Review via email: mp+191829@code.launchpad.net
To post a comment you must log in.
Revision history for this message
James Westby (james-w) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'udd/icommon.py'
2--- udd/icommon.py 2013-05-06 04:51:18 +0000
3+++ udd/icommon.py 2013-10-18 15:26:02 +0000
4@@ -60,7 +60,7 @@
5 u"ubuntu": [u"warty", u"hoary", u"breezy", u"dapper", u"edgy", u"feisty",
6 u"gutsy", u"hardy", u"intrepid", u"jaunty", u"karmic",
7 u"lucid", u"maverick", u"natty", u"oneiric", u"precise",
8- u"quantal", u"raring", u"saucy"],
9+ u"quantal", u"raring", u"saucy", u"trusty"],
10 u"debian": [u"woody", u"sarge", u"etch", u"lenny",
11 u"squeeze", u"wheezy", u"jessie",
12 u"sid", u"experimental"],
13@@ -79,7 +79,7 @@
14 u"ubuntu": [u"warty", u"hoary", u"breezy", u"dapper", u"edgy", u"feisty",
15 u"gutsy", u"hardy", u"intrepid", u"jaunty", u"karmic",
16 u"lucid", u"maverick", u"natty", u"oneiric", u"precise",
17- u"quantal", u"raring", u"saucy"],
18+ u"quantal", u"raring", u"saucy", u"trusty"],
19 u"debian": [u"sid", u"experimental",
20 u"woody", u"sarge", u"etch", u"lenny",
21 u"squeeze", u"wheezy", "jessie"],
22@@ -89,10 +89,10 @@
23 # the likely development focus first to fit better with stacking. No etch or
24 # earlier as they aren't on lp
25 lp_distro_releases = {
26- u"ubuntu": [u"saucy", u"warty", u"hoary", u"breezy", u"dapper", u"edgy",
27+ u"ubuntu": [u"trusty", u"warty", u"hoary", u"breezy", u"dapper", u"edgy",
28 u"feisty", u"gutsy", u"hardy", u"intrepid", u"jaunty",
29 u"karmic", u"lucid", u"maverick", u"natty", u"oneiric",
30- u"precise", u"quantal", u"raring"],
31+ u"precise", u"quantal", u"raring", u"saucy"],
32 u"debian": [u"sid", u"experimental",
33 u"jessie", u"wheezy", u"squeeze", u"lenny"],
34 }

Subscribers

People subscribed via source and target branches