launchpad-reviewers team mailing list archive

["Jeroen T. Vermeulen" <jtv@xxxxxxxxxxxxx>]

Jeroen T. Vermeulen has proposed merging lp:~jtv/maas/bug-1049407 into lp:maas.

Requested reviews:
  MAAS Maintainers (maas-maintainers)
Related bugs:
  Bug #1049407 in MAAS: "DHCP next-server set incorrectly on multi-homed hosts"
  https://bugs.launchpad.net/maas/+bug/1049407

For more details, see:
https://code.launchpad.net/~jtv/maas/bug-1049407/+merge/123891

Pre-imped with Julian.


Jeroen
-- 
https://code.launchpad.net/~jtv/maas/bug-1049407/+merge/123891
Your team MAAS Maintainers is requested to review the proposed merge of lp:~jtv/maas/bug-1049407 into lp:maas.

=== modified file 'contrib/maas_local_settings.py'
--- contrib/maas_local_settings.py	2012-08-16 08:24:49 +0000
+++ contrib/maas_local_settings.py	2012-09-12 07:05:20 +0000
@@ -2,8 +2,8 @@
 DEBUG = False
 
 # Default URL specifying protocol, host, and (if necessary) port where
-# this MAAS can be found.  Configuration can, and probably should,
-# override this.
+# systems in this MAAS can find the MAAS server.  Configuration can, and
+# probably should, override this.
 DEFAULT_MAAS_URL = "http://maas.internal.example.com/";
 
 # Absolute path to the directory static files should be collected to.

=== modified file 'src/maas/settings.py'
--- src/maas/settings.py	2012-08-21 17:21:03 +0000
+++ src/maas/settings.py	2012-09-12 07:05:20 +0000
@@ -60,8 +60,8 @@
 LONGPOLL_PATH = '/longpoll/'
 
 # Default URL specifying protocol, host, and (if necessary) port where
-# this MAAS can be found.  Configuration can, and probably should,
-# override this.
+# systems in this MAAS can find the MAAS server.  Configuration can, and
+# probably should, override this.
 DEFAULT_MAAS_URL = "http://%s/"; % guess_server_address()
 
 if FORCE_SCRIPT_NAME is not None: