← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~rvb/maas/maas-settings-order into lp:maas

 

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

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~rvb/maas/maas-settings-order/+merge/92513

Development settings should override production settings.

For example if DEBUG=False, the static assets are not served by Django right now.
-- 
https://code.launchpad.net/~rvb/maas/maas-settings-order/+merge/92513
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~rvb/maas/maas-settings-order into lp:maas.
=== modified file 'src/maas/demo.py'
--- src/maas/demo.py	2012-02-10 11:32:55 +0000
+++ src/maas/demo.py	2012-02-10 16:44:07 +0000
@@ -10,8 +10,8 @@
 
 __metaclass__ = type
 
+from maas.settings import *
 from maas.development import *
-from maas.settings import *
 
 
 # This should match the setting in Makefile:pserv.pid.