Merge lp:~andreserl/maas/install_maas_local_celerysettings into lp:maas/trunk

Proposed by Andres Rodriguez on 2012-09-21
Status: Merged
Approved by: Andres Rodriguez on 2012-09-21
Approved revision: 1046
Merged at revision: 1046
Proposed branch: lp:~andreserl/maas/install_maas_local_celerysettings
Merge into: lp:maas/trunk
Diff against target: 11 lines (+1/-0)
1 file modified
setup.py (+1/-0)
To merge this branch: bzr merge lp:~andreserl/maas/install_maas_local_celerysettings
Reviewer Review Type Date Requested Status
Raphaël Badin (community) 2012-09-21 Approve on 2012-09-21
Review via email: mp+125735@code.launchpad.net

Commit Message

setup.py: Install maas_local_celerysettings.py

To post a comment you must log in.
Raphaël Badin (rvb) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'setup.py'
2--- setup.py 2012-08-29 03:47:41 +0000
3+++ setup.py 2012-09-21 14:55:22 +0000
4@@ -57,6 +57,7 @@
5 ['etc/pserv.yaml',
6 'etc/txlongpoll.yaml',
7 'etc/celeryconfig.py',
8+ 'contrib/maas_local_celerysettings.py',
9 'etc/maas/import_ephemerals',
10 'etc/maas/import_pxe_files',
11 'etc/maas/commissioning-user-data',