lp:~andreserl/maas/backport_rev1410_to_stabilization

Branch merges

Propose for merging

Merged into lp:maas/1.2 at revision 1340

Raphaël Badin (community): Approve on 2012-12-20

Diff: 147 lines (+92/-0)

5 files modified

src/maasserver/models/node.py (+1/-0)
src/maasserver/power_parameters.py (+19/-0)
src/provisioningserver/enum.py (+4/-0)
src/provisioningserver/power/templates/fence_cdu.template (+54/-0)
src/provisioningserver/power/tests/test_poweraction.py (+14/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1073462: fence_cdu power type is missing

Medium

Fix Released

Link a bug report

Related blueprints

1339. By Andres Rodriguez on 2012-12-20

Backport rev1410 to Stabilization branch

1338. By Nick Veitch on 2012-12-19

[r=jtv][bug=][author=evilnick] Backports of docs changes from trunk

1337. By Jeroen T. Vermeulen on 2012-12-13

[r=jtv][bug=1089464][author=jtv] Backport trunk r1398: complete cluster_uuid handling for pxeconfig API call.

1336. By Jeroen T. Vermeulen on 2012-12-12

[r=jtv][bug=1086239][author=jtv] Backport trunk r1397: Take CLUSTER_UUID from maas_cluster.conf instead of maas_local_celeryconfig_cluster.py.

1335. By Jeroen T. Vermeulen on 2012-12-12

[r=julian-edwards][bug=1084507][author=jtv] Backport trunk r1391: Pass cluster uuid to pxeconfig API call, so it knows which cluster a request comes from.

1334. By Raphaël Badin on 2012-12-04

[r=rvb][bug=1085823][author=rvb] Backport of revision 1390.

1333. By Raphaël Badin on 2012-12-04

[r=rvb][bug=1084292][author=rvb] Backport revision 1392.

1332. By Julian Edwards on 2012-12-04

[r=julian-edwards][bug=1081696,1081701][author=julian-edwards] Fix metadata address mentioned in the preseed. Additionally fix value of 'domain-name-servers' in the dhcp config for non-local clusters. (Backport of r1371, r1376, r1378, r1379, r1380, r1381, r1383, r1384)

1331. By Julian Edwards on 2012-12-04

[r=julian-edwards][bug=1052876][author=julian-edwards] Print more helpful error message when maas-cli is run without arguments (backport r1355 from trunk)

1330. By Julian Edwards on 2012-12-04

[r=julian-edwards][bug=1086210][author=julian-edwards] Defer celery imports in pserv that may load config and issue warnings. (backport r1353 from trunk)