MAAS

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

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

Commit Message

setup.py: Set correct name for maas_local_celeryconfig.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-09-21 14:48:55 +0000
3+++ setup.py 2012-09-21 15:15:45 +0000
4@@ -57,7 +57,7 @@
5 ['etc/pserv.yaml',
6 'etc/txlongpoll.yaml',
7 'etc/celeryconfig.py',
8- 'contrib/maas_local_celerysettings.py',
9+ 'contrib/maas_local_celeryconfig.py',
10 'etc/maas/import_ephemerals',
11 'etc/maas/import_pxe_files',
12 'etc/maas/commissioning-user-data',