← Back to branch summary

~mpontillo/maas/dns-api-ui-consistency--bug-1686864

~mpontillo/maas/dns-api-ui-consistency--bug-1686864

Viewing all changes in revision 6023.

Committer: Mike Pontillo
Date: 2017-04-27 22:41:56 UTC
mfrom: (6016.2.13 maas)
Revision ID: mike.pontillo@canonical.com-20170427224156-ko031qa7rsn2mw0s

Merge trunk.

files added:
scripts/maas-test-enlistment

src/maasserver/migrations/builtin/maasserver/0121_relax_staticipaddress_unique_constraint.py

files modified:
setup.py

snap/bin/maas

src/maasserver/forms/__init__.py

src/maasserver/models/staticipaddress.py

src/maasserver/models/tests/test_staticipaddress.py

src/maasserver/preseed.py

src/maasserver/rpc/boot.py

src/maasserver/rpc/tests/test_boot.py

src/maasserver/static/partials/pods-list.html

src/maasserver/templates/maasserver/prefs.html

src/maasserver/tests/test_preseed.py

src/provisioningserver/drivers/osystem/centos.py

src/provisioningserver/drivers/osystem/custom.py

src/provisioningserver/drivers/osystem/tests/test_centos.py

src/provisioningserver/drivers/osystem/tests/test_custom.py

src/provisioningserver/drivers/osystem/ubuntucore.py

src/provisioningserver/drivers/pod/rsd.py

src/provisioningserver/drivers/pod/tests/test_rsd.py

Show diffs side-by-side

added added

removed removed

scripts/maas-test-enlistment

src/maasserver/forms/__init__.py

src/maasserver/migrations/builtin/maasserver/0121_relax_staticipaddress_unique_constraint.py

src/maasserver/models/staticipaddress.py

src/maasserver/models/tests/test_staticipaddress.py

src/maasserver/preseed.py

src/maasserver/rpc/boot.py

src/maasserver/rpc/tests/test_boot.py

src/maasserver/static/partials/pods-list.html

src/maasserver/templates/maasserver/prefs.html

src/maasserver/tests/test_preseed.py

src/provisioningserver/drivers/osystem/centos.py

src/provisioningserver/drivers/osystem/custom.py

src/provisioningserver/drivers/osystem/tests/test_centos.py

src/provisioningserver/drivers/osystem/tests/test_custom.py

src/provisioningserver/drivers/osystem/ubuntucore.py

src/provisioningserver/drivers/pod/rsd.py

src/provisioningserver/drivers/pod/tests/test_rsd.py

Older »