lp:~rvb/maas/bug-1234853-1.3

Branch merges

Propose for merging

Merged into lp:maas/1.3 at revision 1474

Raphaël Badin (community): Approve on 2013-10-04

Diff: 129 lines (+31/-24)

5 files modified

src/maasserver/api.py (+3/-3)
src/maasserver/forms.py (+3/-10)
src/maasserver/tests/test_forms.py (+3/-10)
src/maasserver/tests/test_views_settings_clusters.py (+15/-0)
src/maasserver/views/settings_clusters.py (+7/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1234853: MAAS returns HTTP/500 when adding a second managed interface to cluster controller

Critical

Fix Released

Link a bug report

Related blueprints

1474. By Raphaël Badin on 2013-10-04

Fix bug 1234853.

1473. By Jeroen T. Vermeulen on 2013-10-01

[r=rvb][bug=1212434,1233069][author=jtv] Backport fixes for bug 1212434 and 1233069 from trunk.

1472. By Raphaël Badin on 2013-09-19

[r=julian-edwards][bug=1208497][author=rvb] Backport revision 1624. Set netboot=False on the allocated nodes with netboot=True. in migration #10.

1471. By Julian Edwards on 2013-09-11

[r=julian-edwards][bug=1223412][author=julian-edwards] Backport trunk r1585: Fix a crash in maas-import-pxe-files caused by an unset environment variable.

1470. By Julian Edwards on 2013-09-06

[r=julian-edwards][bug=1039513][author=julian-edwards] Backport of trunk fixes to make maas-import-pxe-files gpg verify downloaded files.

1469. By Julian Edwards on 2013-09-06

[r=jtv][bug=1158425][author=julian-edwards] Remove a dangerous relative path inclusion in maas-import-pxe files. See lp:1158425 for details.

1468. By Adam Stokes on 2013-08-02

[r=julian-edwards][bug=][author=adam-stokes] Backport r1541 from trunk:

Limit DHCP lease times to 30 seconds for PXE clients.

1467. By Raphaël Badin on 2013-07-26

[r=rvb][bug=1204507][author=rvb] Backport revision 1540: accept empty files.

1466. By Julian Edwards on 2013-06-05

[r=julian-edwards][bug=1069570] Backport r1482 from trunk: 'ignore-client-uids true' in dhcpd.conf.template

1465. By Diogo Matsubara on 2013-05-23

[r=jtv][bug=][author=matsubara] Backport update to the version of docutils and Pygments so make doc will work on raring.