← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~rvb/maas/packaging.remove-commissioning-user-data into lp:~maas-maintainers/maas/packaging

 

Raphaël Badin has proposed merging lp:~rvb/maas/packaging.remove-commissioning-user-data into lp:~maas-maintainers/maas/packaging.

Commit message:
Upstream revision number 1404 removed etc/maas/commissioning-user-data: it is now generated from metadataserver/commissioning/user_data.template.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~rvb/maas/packaging.remove-commissioning-user-data/+merge/140465
-- 
https://code.launchpad.net/~rvb/maas/packaging.remove-commissioning-user-data/+merge/140465
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~rvb/maas/packaging.remove-commissioning-user-data into lp:~maas-maintainers/maas/packaging.
=== modified file 'debian/changelog'
--- debian/changelog	2012-12-11 07:26:33 +0000
+++ debian/changelog	2012-12-18 15:18:27 +0000
@@ -1,4 +1,4 @@
-maas (0.1+bzr1393+dfsg-0ubuntu2) UNRELEASED; urgency=low
+maas (0.1+bzr1404+dfsg-0ubuntu1) UNRELEASED; urgency=low
 
   [ Raphaël Badin ]
   * debian/maas-dns.postinst: Call write_dns_config.
@@ -15,6 +15,8 @@
     on rabbitmq-server. (LP: #1072744)
   * debian/extras/99-maas-sudoers: Add sudo rule for script
     /usr/sbin/maas-import-pxe-files.
+  * debian/maas-cluster-controller.install: Removed commissioning-user-data
+    script.
 
   [ Julian Edwards ]
   * debian/maas-region-controller.install: Remove installation of maas-gc; it

=== modified file 'debian/maas-cluster-controller.install'
--- debian/maas-cluster-controller.install	2012-11-22 23:14:00 +0000
+++ debian/maas-cluster-controller.install	2012-12-18 15:18:27 +0000
@@ -19,7 +19,6 @@
 debian/tmp/etc/maas/import_pxe_files
 debian/tmp/usr/sbin/maas-import-ephemerals
 debian/tmp/etc/maas/import_ephemerals
-debian/tmp/etc/maas/commissioning-user-data
 
 # Install all other stuff
 debian/extras/99-maas-sudoers etc/sudoers.d