MAAS

Merge lp:~blake-rouse/maas/packaging-remove-deployment-user-data into lp:~maas-maintainers/maas/packaging

  1. packaging-remove-deployment-user-data
  2. Merge into packaging
Proposed by Blake Rouse
Status: Merged
Approved by: Blake Rouse
Approved revision: no longer in the source branch.
Merged at revision: 427
Proposed branch: lp:~blake-rouse/maas/packaging-remove-deployment-user-data
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 20 lines (+0/-2)
2 files modified
debian/maas-region-controller-min.install (+0/-1)
debian/maas-region-controller-min.lintian-overrides (+0/-1)
To merge this branch: bzr merge lp:~blake-rouse/maas/packaging-remove-deployment-user-data
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Review via email: mp+273719@code.launchpad.net

Commit message

Remove the deployment-user-data templates folder from being installed during installation, since these files have been removed from trunk.

To post a comment you must log in.
Revision history for this message
Gavin Panella (allenap) wrote :

Nice!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/maas-region-controller-min.install'
2--- debian/maas-region-controller-min.install 2015-08-13 16:55:10 +0000
3+++ debian/maas-region-controller-min.install 2015-10-07 16:09:25 +0000
4@@ -13,7 +13,6 @@
5 # Install templates
6 debian/tmp/etc/maas/templates/dns
7 debian/tmp/etc/maas/templates/commissioning-user-data
8-debian/tmp/etc/maas/templates/deployment-user-data
9
10 # Install driver configuration file
11 debian/tmp/etc/maas/drivers.yaml
12
13=== modified file 'debian/maas-region-controller-min.lintian-overrides'
14--- debian/maas-region-controller-min.lintian-overrides 2015-01-22 22:10:34 +0000
15+++ debian/maas-region-controller-min.lintian-overrides 2015-10-07 16:09:25 +0000
16@@ -3,4 +3,3 @@
17 maas-region-controller-min: script-not-executable etc/maas/templates/commissioning-user-data/snippets/maas_signal.py
18 maas-region-controller-min: script-not-executable etc/maas/templates/commissioning-user-data/user_data.template
19 maas-region-controller-min: script-not-executable etc/maas/templates/commissioning-user-data/snippets/maas_get.py
20-maas-region-controller-min: script-not-executable etc/maas/templates/deployment-user-data/maas_configure_interfaces.py

Subscribers

People subscribed via source and target branches