← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~rvb/maas/missing-files into lp:maas

 

Raphaël Badin has proposed merging lp:~rvb/maas/missing-files into lp:maas.

Commit message:
Include inclusion of data file metadataserver/commissioning/user_data.template / Remove etc/maas/commissioning-user-data from setup.py

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~rvb/maas/missing-files/+merge/140499
-- 
https://code.launchpad.net/~rvb/maas/missing-files/+merge/140499
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~rvb/maas/missing-files into lp:maas.
=== modified file 'MANIFEST.in'
--- MANIFEST.in	2012-08-09 13:16:09 +0000
+++ MANIFEST.in	2012-12-18 17:08:26 +0000
@@ -3,6 +3,7 @@
 graft src/*/fixtures
 graft src/*/specs
 graft src/provisioningserver/*
+graft src/metadataserver/commissioning/*
 graft vdenv
 prune src/*/testing
 prune src/*/tests

=== modified file 'setup.py'
--- setup.py	2012-11-12 14:32:26 +0000
+++ setup.py	2012-12-18 17:08:26 +0000
@@ -61,7 +61,6 @@
              'contrib/maas_local_celeryconfig_cluster.py',
              'etc/maas/import_ephemerals',
              'etc/maas/import_pxe_files',
-             'etc/maas/commissioning-user-data',
              'contrib/maas-http.conf',
              'contrib/maas_local_settings.py']),
         ('/usr/share/maas',