← Back to branch summary

~ltrager/maas/lp1636858_2.0

~ltrager/maas/lp1636858_2.0

Viewing all changes in revision 5201.

Committer: Lee Trager
Date: 2016-10-26 23:37:59 UTC
Revision ID: lee.trager@canonical.com-20161026233759-2ypf5hbpkij0ilyq

https://launchpad.net/bugs/1636858

Backport from 2.1.1 - If the power_parameters are the empty string set them to an empty dictionary, don't use json.loads

files modified:
etc/maas/templates/commissioning-user-data/snippets/maas_enlist.sh

src/maasserver/api/tests/test_machines.py

src/maasserver/forms.py

Show diffs side-by-side

added added

removed removed

etc/maas/templates/commissioning-user-data/snippets/maas_enlist.sh

src/maasserver/api/tests/test_machines.py

src/maasserver/forms.py

Older »