← Back to branch summary

~allenap/maas/repackage

~allenap/maas/repackage

Viewing all changes in revision 1959.

Committer: Gavin Panella
Date: 2014-01-31 15:28:22 UTC
mfrom: (1745.2.130 maas)
Revision ID: gavin.panella@canonical.com-20140131152822-jxwyxb5cafkueq57

Merged trunk into repackage.

files modified:
pkg/maas-cluster/provisioningserver/enum.py

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/tests/test_api.py

Show diffs side-by-side

added added

removed removed

pkg/maas-cluster/provisioningserver/enum.py

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/tests/test_api.py

Older »