Merge lp:~mpontillo/maas/packaging--add-maas-test-enlistment into lp:~maas-maintainers/maas/packaging

Proposed by Mike Pontillo
Status: Merged
Approved by: Mike Pontillo
Approved revision: 554
Merged at revision: 558
Proposed branch: lp:~mpontillo/maas/packaging--add-maas-test-enlistment
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 20 lines (+4/-1)
2 files modified
debian/maas-rack-controller.install (+3/-0)
debian/maas-rack-controller.lintian-overrides (+1/-1)
To merge this branch: bzr merge lp:~mpontillo/maas/packaging--add-maas-test-enlistment
Reviewer Review Type Date Requested Status
Mike Pontillo (community) Approve
Review via email: mp+323284@code.launchpad.net

Commit message

Add /usr/lib/maas/maas-test-enlistment script.

To post a comment you must log in.
Revision history for this message
Mike Pontillo (mpontillo) wrote :

Self-approve minor change.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/maas-rack-controller.install'
--- debian/maas-rack-controller.install 2017-03-23 21:31:18 +0000
+++ debian/maas-rack-controller.install 2017-04-26 22:56:40 +0000
@@ -8,6 +8,9 @@
8debian/tmp/usr/lib/maas/maas-network-monitor8debian/tmp/usr/lib/maas/maas-network-monitor
9debian/tmp/usr/lib/maas/maas-dhcp-monitor9debian/tmp/usr/lib/maas/maas-dhcp-monitor
1010
11# Install test scripts
12debian/tmp/usr/lib/maas/maas-test-enlistment
13
11# Install all other stuff14# Install all other stuff
12debian/extras/99-maas-sudoers etc/sudoers.d15debian/extras/99-maas-sudoers etc/sudoers.d
13debian/extras/maas-rack usr/sbin16debian/extras/maas-rack usr/sbin
1417
=== modified file 'debian/maas-rack-controller.lintian-overrides'
--- debian/maas-rack-controller.lintian-overrides 2017-03-23 21:31:18 +0000
+++ debian/maas-rack-controller.lintian-overrides 2017-04-26 22:56:40 +0000
@@ -1,1 +1,1 @@
1maas-rack-controller: binary-without-manpage usr/bin/uec2roottar usr/sbin/maas-dhcp-helper usr/lib/maas/maas-network-monitor usr/lib/maas/maas-dhcp-monitor1maas-rack-controller: binary-without-manpage usr/bin/uec2roottar usr/sbin/maas-dhcp-helper usr/lib/maas/maas-network-monitor usr/lib/maas/maas-dhcp-monitor usr/lib/maas/maas-test-enlistment

Subscribers

People subscribed via source and target branches