← Back to branch summary

~allenap/maas/repackage

~allenap/maas/repackage

Viewing all changes in revision 2605.

Committer: Gavin Panella
Date: 2014-07-20 19:55:52 UTC
mfrom: (1745.2.830 maas)
Revision ID: gavin.panella@canonical.com-20140720195552-gerpdga4v2j9x2dm

Merge trunk r2575.

files modified:
pkg/maas-region/maasserver/api.py

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

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

pkg/maas-region/maasserver/preseed.py

pkg/maas-region/maasserver/tests/test_api_enlistment.py

pkg/maas-region/maasserver/tests/test_api_pxeconfig.py

pkg/maas-region/maasserver/tests/test_compose_preseed.py

pkg/maas-region/maasserver/tests/test_forms.py

pkg/maas-region/maasserver/tests/test_node_action.py

pkg/maas-region/maasserver/tests/test_preseed.py

Show diffs side-by-side

added added

removed removed

pkg/maas-region/maasserver/api.py

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

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

pkg/maas-region/maasserver/preseed.py

pkg/maas-region/maasserver/tests/test_api_enlistment.py

pkg/maas-region/maasserver/tests/test_api_pxeconfig.py

pkg/maas-region/maasserver/tests/test_compose_preseed.py

pkg/maas-region/maasserver/tests/test_forms.py

pkg/maas-region/maasserver/tests/test_node_action.py

pkg/maas-region/maasserver/tests/test_preseed.py

Older »