← Back to branch summary

~allenap/maas/repackage

~allenap/maas/repackage

Viewing all changes in revision 2258.

Committer: Gavin Panella
Date: 2014-07-15 16:47:25 UTC
mfrom: (1745.2.484 maas)
Revision ID: gavin.panella@canonical.com-20140715164725-nhe6ffyvotukal9e

Merge trunk r2229.

files modified:
pkg/maas-client/maascli/api.py

pkg/maas-region/etc/maas/templates/commissioning-user-data/snippets/maas_ipmi_autodetect.py

pkg/maas-region/maasserver/api.py

pkg/maas-region/maasserver/support/pertenant/tests/test_migration.py

pkg/maas-region/maasserver/testing/factory.py

pkg/maas-region/maasserver/views/tests/test_clusters.py

pkg/maas-region/maasserver/views/tests/test_general.py

Show diffs side-by-side

added added

removed removed

pkg/maas-client/maascli/api.py

pkg/maas-region/etc/maas/templates/commissioning-user-data/snippets/maas_ipmi_autodetect.py

pkg/maas-region/maasserver/api.py

pkg/maas-region/maasserver/support/pertenant/tests/test_migration.py

pkg/maas-region/maasserver/testing/factory.py

pkg/maas-region/maasserver/views/tests/test_clusters.py

pkg/maas-region/maasserver/views/tests/test_general.py

Older »