← Back to branch summary

~mpontillo/maas/allow-multiple-macs-on-the-same-node

~mpontillo/maas/allow-multiple-macs-on-the-same-node

Viewing all changes in revision 5780.

Committer: Mike Pontillo
Date: 2017-03-06 14:47:58 UTC
mfrom: (5763.1.24 maas)
Revision ID: mike.pontillo@canonical.com-20170306144758-qgq05wexs1qy2ow2

Merge trunk.

files added:
src/maasserver/static/assets/images/0d8e27a6-pass.svg

src/maasserver/static/assets/images/9b78d7f1-timed+out.svg

src/maasserver/static/assets/images/b603b4e0-pending.svg

src/maasserver/static/assets/images/fa6793c0-running.svg

files modified:
Makefile

src/maasserver/preseed.py

src/maasserver/preseed_network.py

src/maasserver/static/css/build.css

src/maasserver/tests/test_preseed.py

src/maasserver/tests/test_preseed_network.py

src/maasserver/tests/test_webapp.py

src/maasserver/webapp.py

src/metadataserver/api_twisted.py

src/metadataserver/builtin_scripts/hooks.py

src/metadataserver/tests/test_api_twisted.py

Show diffs side-by-side

added added

removed removed

src/maasserver/preseed.py

src/maasserver/preseed_network.py

src/maasserver/static/assets/images/0d8e27a6-pass.svg

src/maasserver/static/assets/images/9b78d7f1-timed+out.svg

src/maasserver/static/assets/images/b603b4e0-pending.svg

src/maasserver/static/assets/images/fa6793c0-running.svg

src/maasserver/static/css/build.css

src/maasserver/tests/test_preseed.py

src/maasserver/tests/test_preseed_network.py

src/maasserver/tests/test_webapp.py

src/maasserver/webapp.py

src/metadataserver/api_twisted.py

src/metadataserver/builtin_scripts/hooks.py

src/metadataserver/tests/test_api_twisted.py

Older »