← Back to branch summary

~allenap/maas/repackage

~allenap/maas/repackage

Viewing all changes in revision 2280.

Committer: Gavin Panella
Date: 2014-07-15 16:49:09 UTC
mfrom: (1745.2.506 maas)
Revision ID: gavin.panella@canonical.com-20140715164909-x0347ivwx0vyok76

Merge trunk r2251.

files modified:
pkg/maas-region/etc/maas/preseeds/generic

pkg/maas-region/maasserver/forms.py

pkg/maas-region/maasserver/forms_settings.py

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

pkg/maas-region/maasserver/preseed.py

pkg/maas-region/maasserver/templates/maasserver/settings.html

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

pkg/maas-region/maasserver/views/settings.py

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

Show diffs side-by-side

added added

removed removed

pkg/maas-region/etc/maas/preseeds/generic

pkg/maas-region/maasserver/forms.py

pkg/maas-region/maasserver/forms_settings.py

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

pkg/maas-region/maasserver/preseed.py

pkg/maas-region/maasserver/templates/maasserver/settings.html

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

pkg/maas-region/maasserver/views/settings.py

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

Older »