Merge lp:~lutostag/maas/packaging.trusty+fix1352273 into lp:~maas-maintainers/maas/packaging.trusty

Proposed by Greg Lutostanski
Status: Merged
Approved by: Julian Edwards
Approved revision: 287
Merged at revision: 287
Proposed branch: lp:~lutostag/maas/packaging.trusty+fix1352273
Merge into: lp:~maas-maintainers/maas/packaging.trusty
Diff against target: 32 lines (+3/-1)
2 files modified
debian/changelog (+2/-0)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~lutostag/maas/packaging.trusty+fix1352273
Reviewer Review Type Date Requested Status
Graham Binns (community) Approve
Review via email: mp+229560@code.launchpad.net

Commit message

Move python-pexpect dep to python-maas-provisioningserver

Description of the change

Move python-pexpect dep to python-maas-provisioningserver

To post a comment you must log in.
Graham Binns (gmb) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2014-07-24 18:48:02 +0000
+++ debian/changelog 2014-08-05 06:37:13 +0000
@@ -7,6 +7,8 @@
7 - maas-cluster-controller depends on grub-common7 - maas-cluster-controller depends on grub-common
8 - maas-provisioningserver not maas-cluster-controller depends on8 - maas-provisioningserver not maas-cluster-controller depends on
9 python-seamicroclient (LP: #1332532)9 python-seamicroclient (LP: #1332532)
10 - maas-provisioningserver not maas-cluster-controller depends on
11 python-pexpect (LP: #1352273)
1012
11 + [ Gavin Panella ]13 + [ Gavin Panella ]
12 * debian/maas-cluster-controller.postinst14 * debian/maas-cluster-controller.postinst
1315
=== modified file 'debian/control'
--- debian/control 2014-07-24 18:48:02 +0000
+++ debian/control 2014-08-05 06:37:13 +0000
@@ -99,6 +99,7 @@
99 python-oops-datedir-repo,99 python-oops-datedir-repo,
100 python-oops-twisted,100 python-oops-twisted,
101 python-paramiko,101 python-paramiko,
102 python-pexpect,
102 python-pyparsing,103 python-pyparsing,
103 python-seamicroclient,104 python-seamicroclient,
104 python-simplestreams,105 python-simplestreams,
@@ -159,7 +160,6 @@
159 python-maas-provisioningserver (=${binary:Version}),160 python-maas-provisioningserver (=${binary:Version}),
160 python-netaddr,161 python-netaddr,
161 python-oauth,162 python-oauth,
162 python-pexpect,
163 python-tempita,163 python-tempita,
164 python-twisted,164 python-twisted,
165 python-zope.interface,165 python-zope.interface,

Subscribers

People subscribed via source and target branches