Merge lp:~lutostag/maas/packaging.trusty+move-python-seamicroclient-dep into lp:~maas-maintainers/maas/packaging.trusty

Proposed by Greg Lutostanski on 2014-06-20
Status: Merged
Merged at revision: 284
Proposed branch: lp:~lutostag/maas/packaging.trusty+move-python-seamicroclient-dep
Merge into: lp:~maas-maintainers/maas/packaging.trusty
Diff against target: 36 lines (+7/-2)
2 files modified
debian/changelog (+6/-1)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~lutostag/maas/packaging.trusty+move-python-seamicroclient-dep
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) 2014-06-20 Approve on 2014-06-20
Review via email: mp+223960@code.launchpad.net
To post a comment you must log in.
Andres Rodriguez (andreserl) wrote :

lgtm! Please don't forget to set a commit message.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-06-04 03:33:34 +0000
3+++ debian/changelog 2014-06-20 16:32:13 +0000
4@@ -1,6 +1,11 @@
5 maas (1.5.4+bzr2287-0ubuntu1) UNRELEASED; urgency=medium
6
7- * UNRELEASED
8+ * UNRELEASED
9+
10+ [ Greg Lutostanski ]
11+ * debian/control:
12+ - maas-provisioningserver not maas-cluster-controller depends on
13+ python-seamicroclient (LP: #1332532)
14
15 -- Julian Edwards <julian.edwards@canonical.com> Wed, 04 Jun 2014 13:32:00 +1000
16
17
18=== modified file 'debian/control'
19--- debian/control 2014-05-23 11:01:25 +0000
20+++ debian/control 2014-06-20 16:32:13 +0000
21@@ -99,6 +99,7 @@
22 python-oops-datedir-repo,
23 python-oops-twisted,
24 python-pyparsing,
25+ python-seamicroclient,
26 python-simplestreams,
27 python-tempita,
28 python-twisted-core,
29@@ -157,7 +158,6 @@
30 python-netaddr,
31 python-oauth,
32 python-pexpect,
33- python-seamicroclient,
34 python-tempita,
35 python-twisted,
36 python-zope.interface,

Subscribers

People subscribed via source and target branches