← Back to branch summary

~lamont/maas/bug-1599223-2.0

~lamont/maas/bug-1599223-2.0

Viewing all changes in revision 4532.3.1.

Committer: Mike Pontillo
Date: 2015-12-04 20:10:02 UTC
mto: This revision was merged to the branch mainline in revision 4547.
Revision ID: mike.pontillo@canonical.com-20151204201002-1k3t8erytvtsy7tp

Merge revision 4520 from MAAS 1.9 (IP allocation fixes, bug #1519090, #1519077)

files added:
utilities/remote-reinstall

files removed:
.idea/vcs.xml

files modified:
.idea/encodings.xml

src/maasserver/api/devices.py

src/maasserver/api/tests/test_devices.py

src/maasserver/models/interface.py

src/maasserver/models/node.py

src/maasserver/models/nodegroupinterface.py

src/maasserver/models/staticipaddress.py

src/maasserver/models/subnet.py

src/maasserver/models/tests/test_interface.py

src/maasserver/models/tests/test_nodegroupinterface.py

src/maasserver/testing/factory.py

Show diffs side-by-side

added added

removed removed

.idea/encodings.xml

src/maasserver/api/devices.py

src/maasserver/api/tests/test_devices.py

src/maasserver/models/interface.py

src/maasserver/models/node.py

src/maasserver/models/nodegroupinterface.py

src/maasserver/models/staticipaddress.py

src/maasserver/models/subnet.py

src/maasserver/models/tests/test_interface.py

src/maasserver/models/tests/test_nodegroupinterface.py

src/maasserver/testing/factory.py

utilities/remote-reinstall

Older »