← Back to branch summary

~allenap/maas/repackage

~allenap/maas/repackage

Viewing all changes in revision 2443.

Committer: Gavin Panella
Date: 2014-07-15 20:09:37 UTC
mfrom: (1745.2.669 maas)
Revision ID: gavin.panella@canonical.com-20140715200937-56nrkzvfnzr3u4rb

Merge trunk r2414.

files added:
pkg/maas-cluster/provisioningserver/testing/os.py

pkg/maas-region/maasserver/utils/os.py

files modified:
pkg/maas-cluster/provisioningserver/boot/tests/test_tftppath.py

pkg/maas-region/maasserver/forms.py

pkg/maas-region/maasserver/forms_settings.py

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

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

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

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

Show diffs side-by-side

added added

removed removed

pkg/maas-cluster/provisioningserver/boot/tests/test_tftppath.py

pkg/maas-cluster/provisioningserver/testing/os.py

pkg/maas-region/maasserver/forms.py

pkg/maas-region/maasserver/forms_settings.py

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

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

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

pkg/maas-region/maasserver/utils/os.py

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

Older »