← Back to branch summary

~allenap/maas/repackage

~allenap/maas/repackage

Viewing all changes in revision 2447.

Committer: Gavin Panella
Date: 2014-07-15 20:09:43 UTC
mfrom: (1745.2.673 maas)
Revision ID: gavin.panella@canonical.com-20140715200943-hbe0uewrd9p6xx5u

Merge trunk r2418.

files modified:
docs/bootsources.rst

docs/enum.rst

pkg/maas-region/maasserver/forms_settings.py

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

pkg/maas-region/maasserver/static/js/license_key.js

pkg/maas-region/maasserver/static/js/tests/test_license_key.js

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

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

Show diffs side-by-side

added added

removed removed

docs/bootsources.rst

pkg/maas-region/maasserver/forms_settings.py

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

pkg/maas-region/maasserver/static/js/license_key.js

pkg/maas-region/maasserver/static/js/tests/test_license_key.js

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

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

Older »