Offspring

Merge lp:~bigkevmcd/offspring/fix-bug-1162939 into lp:offspring

  1. fix-bug-1162939
  2. Merge into trunk
Proposed by Kevin McDermott
Status: Merged
Merged at revision: 183
Proposed branch: lp:~bigkevmcd/offspring/fix-bug-1162939
Merge into: lp:offspring
Diff against target: 23 lines (+0/-2)
2 files modified
lib/offspring/master/master.py (+0/-1)
lib/offspring/web/queuemanager/models.py (+0/-1)
To merge this branch: bzr merge lp:~bigkevmcd/offspring/fix-bug-1162939
Reviewer Review Type Date Requested Status
Timothy R. Chavez Approve
Review via email: mp+192484@code.launchpad.net

Description of the change

Trivial fix, tests pass.

To post a comment you must log in.
Revision history for this message
Timothy R. Chavez (timrchavez) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/offspring/master/master.py'
2--- lib/offspring/master/master.py 2013-10-08 08:27:28 +0000
3+++ lib/offspring/master/master.py 2013-10-24 11:23:21 +0000
4@@ -200,7 +200,6 @@
5 #XXX: ARCH_MACHINE_SUPPORT is a bit of hack
6 ARCH_MACHINE_SUPPORT = {
7 u"i386": [u"i386", u"i686", u"x86_64"],
8- u"lpia": [u"i386", u"i686", u"x86_64"],
9 u"amd64": [u"x86_64"],
10 u"armel": [u"armv7l"],
11 u"armhf": [u"armv7l"],
12
13=== modified file 'lib/offspring/web/queuemanager/models.py'
14--- lib/offspring/web/queuemanager/models.py 2013-10-10 15:23:03 +0000
15+++ lib/offspring/web/queuemanager/models.py 2013-10-24 11:23:21 +0000
16@@ -22,7 +22,6 @@
17 ARCH_CHOICES = (
18 (u'i386', u'i386'),
19 (u'amd64', u'amd64'),
20- (u'lpia', u'lpia'),
21 (u'armel', u'armel'),
22 (u'armhf', u'armhf'),
23 (u'arm64', u'arm64'),

Subscribers

People subscribed via source and target branches