← Back to branch summary

~allenap/maas/repackage

~allenap/maas/repackage

Viewing all changes in revision 2414.

Committer: Gavin Panella
Date: 2014-07-15 20:00:02 UTC
mfrom: (1745.2.640 maas)
Revision ID: gavin.panella@canonical.com-20140715200002-3vg0woanjjdbonh7

Merge trunk r2385.

files modified:
pkg/maas-cluster/provisioningserver/driver/__init__.py

pkg/maas-region/maasserver/compose_preseed.py

pkg/maas-region/maasserver/enum.py

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

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

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

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

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

Show diffs side-by-side

added added

removed removed

pkg/maas-cluster/provisioningserver/driver/__init__.py

pkg/maas-region/maasserver/compose_preseed.py

pkg/maas-region/maasserver/enum.py

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

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

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

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

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

Older »