← Back to branch summary

~allenap/maas/repackage

~allenap/maas/repackage

Viewing all changes in revision 2070.

Committer: Gavin Panella
Date: 2014-03-30 21:29:28 UTC
mfrom: (1745.2.300 maas)
Revision ID: gavin.panella@canonical.com-20140330212928-z4bplpbwsi2wxm5s

Merge trunk r2045.

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

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

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

Show diffs side-by-side

added added

removed removed

pkg/maas-region/maasserver/api.py

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

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

Older »