← Back to branch summary

~blake-rouse/maas/is-importing-2.1

~blake-rouse/maas/is-importing-2.1

Viewing all changes in revision 5544.5.5.

Committer: LaMont Jones
Date: 2016-11-22 00:53:43 UTC
mfrom: (5550 2.1)
mto: This revision was merged to the branch mainline in revision 5563.
Revision ID: lamont@canonical.com-20161122005343-5znrs13g6c8f9aak

Merge trunk.

files modified:
docs/changelog.rst

src/maas/settings.py

src/maasserver/config.py

src/maasserver/listener.py

src/maasserver/management/commands/_config.py

src/maasserver/management/commands/tests/test_config.py

src/maasserver/migrations/south/django16_south_maas19.tar.gz

src/maasserver/preseed.py

src/maasserver/static/partials/node-details.html

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

src/maasserver/tests/test_config.py

src/maasserver/tests/test_listener.py

src/maasserver/tests/test_preseed.py

src/maasserver/websockets/handlers/node.py

src/maasserver/websockets/handlers/tests/test_machine.py

src/provisioningserver/boot/tests/test_uefi_amd64.py

Show diffs side-by-side

added added

removed removed

docs/changelog.rst

src/maas/settings.py

src/maasserver/config.py

src/maasserver/listener.py

src/maasserver/management/commands/_config.py

src/maasserver/management/commands/tests/test_config.py

src/maasserver/migrations/south/django16_south_maas19.tar.gz

src/maasserver/preseed.py

src/maasserver/static/partials/node-details.html

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

src/maasserver/tests/test_config.py

src/maasserver/tests/test_listener.py

src/maasserver/tests/test_preseed.py

src/maasserver/websockets/handlers/node.py

src/maasserver/websockets/handlers/tests/test_machine.py

src/provisioningserver/boot/tests/test_uefi_amd64.py

Older »