← Back to branch summary

~allenap/maas/repackage

~allenap/maas/repackage

Viewing all changes in revision 2520.

Committer: Gavin Panella
Date: 2014-07-15 20:42:34 UTC
mfrom: (1745.2.746 maas)
Revision ID: gavin.panella@canonical.com-20140715204234-88ecdryg6d7lmnri

Merge trunk r2491.

files modified:
pkg/maas-cluster/provisioningserver/utils/tests/test_network.py

pkg/maas-region/maasserver/models/network.py

pkg/maas-region/maasserver/models/nodegroupinterface.py

pkg/maas-region/maasserver/models/tests/test_network.py

Show diffs side-by-side

added added

removed removed

pkg/maas-cluster/provisioningserver/utils/tests/test_network.py

pkg/maas-region/maasserver/models/network.py

pkg/maas-region/maasserver/models/nodegroupinterface.py

pkg/maas-region/maasserver/models/tests/test_network.py

Older »