Merge lp:~allenap/maas/packaging.rename-scripts-and-prepare-for-twistd-in-region into lp:~maas-maintainers/maas/packaging

Proposed by Gavin Panella
Status: Merged
Approved by: Gavin Panella
Approved revision: 333
Merged at revision: 338
Proposed branch: lp:~allenap/maas/packaging.rename-scripts-and-prepare-for-twistd-in-region
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 10 lines (+1/-1)
1 file modified
debian/maas-cluster-controller.install (+1/-1)
To merge this branch: bzr merge lp:~allenap/maas/packaging.rename-scripts-and-prepare-for-twistd-in-region
Reviewer Review Type Date Requested Status
Newell Jensen (community) Approve
Graham Binns (community) Approve
Review via email: mp+240431@code.launchpad.net

Commit message

The Twisted plug-in maasps.py has changed name to maasclusterd.py.

Description of the change

To post a comment you must log in.
Revision history for this message
Graham Binns (gmb) :
review: Approve
Revision history for this message
Newell Jensen (newell-jensen) :
review: Approve
Revision history for this message
Newell Jensen (newell-jensen) wrote :

LGTM

333. By Gavin Panella

Merged packaging into packaging.rename-scripts-and-prepare-for-twistd-in-region.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/maas-cluster-controller.install'
2--- debian/maas-cluster-controller.install 2014-09-24 22:41:29 +0000
3+++ debian/maas-cluster-controller.install 2014-12-09 16:38:20 +0000
4@@ -1,5 +1,5 @@
5 # Install twisted plugins
6-twisted/plugins/maasps.py usr/share/pyshared/twisted/plugins
7+twisted/plugins/maasclusterd.py usr/share/pyshared/twisted/plugins
8
9 # Install PSERV config file
10 debian/tmp/etc/maas/pserv.yaml

Subscribers

People subscribed via source and target branches