MAAS

Merge lp:~rvb/maas/missing-files into lp:maas/trunk

  1. missing-files
  2. Merge into trunk
Proposed by Raphaël Badin on 2012-12-18
Status: Merged
Approved by: Raphaël Badin on 2012-12-18
Approved revision: 1405
Merged at revision: 1405
Proposed branch: lp:~rvb/maas/missing-files
Merge into: lp:maas/trunk
Diff against target: 23 lines (+1/-1)
2 files modified
MANIFEST.in (+1/-0)
setup.py (+0/-1)
To merge this branch: bzr merge lp:~rvb/maas/missing-files
Reviewer Review Type Date Requested Status
Jeroen T. Vermeulen (community) 2012-12-18 Approve on 2012-12-18
Review via email: mp+140499@code.launchpad.net

Commit Message

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

To post a comment you must log in.
Jeroen T. Vermeulen (jtv) wrote :

Once more today thanks for complementing me. :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'MANIFEST.in'
2--- MANIFEST.in 2012-08-09 13:16:09 +0000
3+++ MANIFEST.in 2012-12-18 17:08:26 +0000
4@@ -3,6 +3,7 @@
5 graft src/*/fixtures
6 graft src/*/specs
7 graft src/provisioningserver/*
8+graft src/metadataserver/commissioning/*
9 graft vdenv
10 prune src/*/testing
11 prune src/*/tests
12
13=== modified file 'setup.py'
14--- setup.py 2012-11-12 14:32:26 +0000
15+++ setup.py 2012-12-18 17:08:26 +0000
16@@ -61,7 +61,6 @@
17 'contrib/maas_local_celeryconfig_cluster.py',
18 'etc/maas/import_ephemerals',
19 'etc/maas/import_pxe_files',
20- 'etc/maas/commissioning-user-data',
21 'contrib/maas-http.conf',
22 'contrib/maas_local_settings.py']),
23 ('/usr/share/maas',