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

Proposed by Jeroen T. Vermeulen on 2014-04-07
Status: Superseded
Proposed branch: lp:~jtv/maas/1.5-bug-1302772
Merge into: lp:maas/trunk
Diff against target: 21 lines (+9/-0) (has conflicts)
1 file modified
src/provisioningserver/custom_hardware/seamicro.py (+9/-0)
Text conflict in src/provisioningserver/custom_hardware/seamicro.py
To merge this branch: bzr merge lp:~jtv/maas/1.5-bug-1302772
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) 2014-04-07 Needs Fixing on 2014-04-07
Review via email: mp+214550@code.launchpad.net

This proposal has been superseded by a proposal from 2014-04-07.

Commit message

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

To post a comment you must log in.
Andres Rodriguez (andreserl) wrote :

There are conflicts in the branch

review: Needs Fixing

Unmerged revisions

2226. By Jeroen T. Vermeulen on 2014-04-07

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

2225. By Blake Rouse on 2014-04-07

[r=gmb][bug=1302818][author=blake-rouse] Fixes typo not allowing ipmi to be set as a power_control type for seamicro15k.

2224. By Jeroen T. Vermeulen on 2014-04-04

[r=andreserl][bug=1302819][author=blake-rouse] Fix SM15k v2.0 API enlistment issue.

2223. By Gavin Panella on 2014-04-03

[r=allenap][bug=1187826][author=allenap] Backport of revision 2226: Allow uploading of files from the command-line using a new parameter@=filename syntax.

For example, this enables creating commissioning scripts from the command-line API client.

2222. By Gavin Panella on 2014-04-03

[r=jtv][bug=1293676][author=allenap] Backport from trunk r2221: Inhibit the controls to change between fast and default installers when the use-fastpath-installer tag is defined with an expression.

2221. By Raphaël Badin on 2014-04-03

[r=rvb][bug=1301809][author=rvb] Backport of revision 2224: Change list_boot_images() so that it can cope with a missing boot images directory: this happens if the reporting task runs before the images have been imported.

2220. By Raphaël Badin on 2014-04-03

[r=rvb][bug=1301242][author=rvb] Backport revision 2223: This branch makes the cluster listings deal gracefully with a large number of clusters. Additionally, it makes the cluster listing pages more accessible.

In details:
- Move the cluster listings to their own url (instead of displaying them on the 'settings' page).
- Split the cluster listings into 3 separate listings (one page for each possible cluster status).
- Add a link to the cluster listing page next to 'Nodes' at the top of the page.
- Add pagination to all the listings.

2219. By Raphaël Badin on 2014-04-02

[r=rvb][bug=1298790][author=rvb] Backport revision 2219: Add a 'logout confirmation' page. Using this, the logout action is protected against CSRF attacks because it uses a POST request, in conjunction with Django's CSRF protection feature.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/provisioningserver/custom_hardware/seamicro.py'
2--- src/provisioningserver/custom_hardware/seamicro.py 2014-04-07 10:39:19 +0000
3+++ src/provisioningserver/custom_hardware/seamicro.py 2014-04-07 14:25:30 +0000
4@@ -24,8 +24,17 @@
5 import urlparse
6
7 import provisioningserver.custom_hardware.utils as utils
8+<<<<<<< TREE
9 from seamicroclient import exceptions as seamicro_exceptions
10 from seamicroclient.v2 import client as seamicro_client
11+=======
12+from seamicroclient.v2 import (
13+ client as seamicro_client,
14+ )
15+from seamicroclient import (
16+ exceptions as seamicro_exceptions,
17+ )
18+>>>>>>> MERGE-SOURCE
19
20
21 logger = logging.getLogger(__name__)