← Back to branch summary

~allenap/maas/repackage

~allenap/maas/repackage

Viewing all changes in revision 2175.

Committer: Gavin Panella
Date: 2014-04-01 11:38:26 UTC
mfrom: (1745.2.404 maas)
Revision ID: gavin.panella@canonical.com-20140401113826-91jh2cm9f552j9xk

Merge trunk r2149.

files added:
pkg/maas-region/maasserver/tests/test_api_boot_images.py

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

pkg/maas-cluster/provisioningserver/tests/test_boot_images.py

pkg/maas-region/maasserver/api.py

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

pkg/maas-region/maasserver/urls_api.py

Show diffs side-by-side

added added

removed removed

pkg/maas-cluster/provisioningserver/boot_images.py

pkg/maas-cluster/provisioningserver/tests/test_boot_images.py

pkg/maas-region/maasserver/api.py

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

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

pkg/maas-region/maasserver/urls_api.py

Older »