← Back to branch summary

~mpontillo/maas/discovery-js-factory

~mpontillo/maas/discovery-js-factory

Viewing all changes in revision 5331.

Committer: Mike Pontillo
Date: 2016-09-02 20:31:39 UTC
mfrom: (5312.1.9 maas)
Revision ID: mike.pontillo@canonical.com-20160902203139-kuaixieq15utq8o4

Merge trunk and fix conflict in src/maasserver/websockets/handlers/__init__.py.

files added:
src/maasserver/websockets/handlers/bootresource.py

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

files modified:
contrib/preseeds_v2/enlist_userdata

src/maasserver/api/maas.py

src/maasserver/api/tests/test_maas.py

src/maasserver/bootsources.py

src/maasserver/compose_preseed.py

src/maasserver/forms.py

src/maasserver/models/packagerepository.py

src/maasserver/preseed.py

src/maasserver/rpc/packagerepository.py

src/maasserver/rpc/tests/test_regionservice_calls.py

src/maasserver/templates/maasserver/settings.html

src/maasserver/tests/test_compose_preseed.py

src/maasserver/tests/test_preseed.py

src/maasserver/views/tests/test_settings.py

src/maasserver/websockets/handlers/__init__.py

src/maasserver/websockets/tests/test_protocol.py

src/provisioningserver/config.py

src/provisioningserver/refresh/node_info_scripts.py

src/provisioningserver/refresh/tests/test_node_info_scripts.py

Show diffs side-by-side

added added

removed removed

contrib/preseeds_v2/enlist_userdata

src/maasserver/api/maas.py

src/maasserver/api/tests/test_maas.py

src/maasserver/bootsources.py

src/maasserver/compose_preseed.py

src/maasserver/forms.py

src/maasserver/models/packagerepository.py

src/maasserver/preseed.py

src/maasserver/rpc/packagerepository.py

src/maasserver/rpc/tests/test_regionservice_calls.py

src/maasserver/templates/maasserver/settings.html

src/maasserver/tests/test_compose_preseed.py

src/maasserver/tests/test_preseed.py

src/maasserver/views/tests/test_settings.py

src/maasserver/websockets/handlers/__init__.py

src/maasserver/websockets/handlers/bootresource.py

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

src/maasserver/websockets/tests/test_protocol.py

src/provisioningserver/config.py

src/provisioningserver/refresh/node_info_scripts.py

src/provisioningserver/refresh/tests/test_node_info_scripts.py

Older »