Merge lp:~jtv/maas/1.5-bug-1302772 into lp:~maas-committers/maas/trunk

[Jeroen T. Vermeulen]

Backport trunk r2235: Continue to accept (but do not use) the old “boot” section in pserv.yaml. Otherwise, upgrade breaks while parsing this file.

[Andres Rodriguez (andreserl)]

There are conflicts in the branch

review: Needs Fixing

=== modified file 'src/provisioningserver/custom_hardware/seamicro.py'
--- src/provisioningserver/custom_hardware/seamicro.py	2014-04-07 10:39:19 +0000
+++ src/provisioningserver/custom_hardware/seamicro.py	2014-04-07 14:25:30 +0000
@@ -24,8 +24,17 @@
 import urlparse
 
 import provisioningserver.custom_hardware.utils as utils
+<<<<<<< TREE
 from seamicroclient import exceptions as seamicro_exceptions
 from seamicroclient.v2 import client as seamicro_client
+=======
+from seamicroclient.v2 import (
+    client as seamicro_client,
+    )
+from seamicroclient import (
+    exceptions as seamicro_exceptions,
+    )
+>>>>>>> MERGE-SOURCE
 
 
 logger = logging.getLogger(__name__)