← Back to branch summary

~lamont/maas/bug-1645912-2.1

~lamont/maas/bug-1645912-2.1

Viewing all changes in revision 5449.1.2.

Committer: LaMont Jones
Date: 2016-10-12 15:26:17 UTC
mfrom: (5469 maas)
mto: This revision was merged to the branch mainline in revision 5482.
Revision ID: lamont@canonical.com-20161012152617-t14n2jt7y5b7hidb

Merge trunk.

files added:
src/maasserver/migrations/builtin/maasserver/0092_rolling.py

files modified:
Makefile

buildout.cfg

contrib/preseeds_v2/curtin_userdata

src/maasserver/api/account.py

src/maasserver/api/tests/test_api.py

src/maasserver/bootresources.py

src/maasserver/dhcp.py

src/maasserver/dns/tests/test_zonegenerator.py

src/maasserver/dns/zonegenerator.py

src/maasserver/fields.py

src/maasserver/forms_interface_link.py

src/maasserver/forms_settings.py

src/maasserver/management/commands/apikey.py

src/maasserver/models/bootresource.py

src/maasserver/models/signals/bootsources.py

src/maasserver/models/signals/tests/test_bootsources.py

src/maasserver/models/tests/test_bootresource.py

src/maasserver/models/user.py

src/maasserver/models/userprofile.py

src/maasserver/populate_tags.py

src/maasserver/rpc/rackcontrollers.py

src/maasserver/rpc/regionservice.py

src/maasserver/rpc/tests/test_rackcontrollers.py

src/maasserver/rpc/tests/test_regionservice.py

src/maasserver/static/js/angular/controllers/networks_list.js

src/maasserver/static/js/angular/controllers/tests/test_networks_list.js

src/maasserver/static/js/angular/directives/boot_images.js

src/maasserver/static/js/angular/directives/tests/test_boot_images.js

src/maasserver/static/js/angular/maas.js

src/maasserver/static/partials/boot-images.html

src/maasserver/static/partials/dashboard.html

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

src/maasserver/testing/factory.py

src/maasserver/tests/test_bootresources.py

src/maasserver/tests/test_commands.py

src/maasserver/tests/test_fields.py

src/maasserver/tests/test_forms_interface_link.py

src/maasserver/tests/test_populate_tags.py

src/maasserver/triggers/system.py

src/maasserver/triggers/tests/test_system_listener.py

src/maasserver/triggers/tests/test_websocket.py

src/maasserver/triggers/tests/test_websocket_listener.py

src/maasserver/triggers/websocket.py

src/maasserver/utils/threads.py

src/provisioningserver/import_images/download_resources.py

src/provisioningserver/import_images/tests/test_download_resources.py

src/provisioningserver/monkey.py

src/provisioningserver/tests/test_monkey.py

src/provisioningserver/utils/tests/test_twisted.py

src/provisioningserver/utils/twisted.py

versions.cfg

Show diffs side-by-side

added added

removed removed

contrib/preseeds_v2/curtin_userdata

src/maasserver/api/account.py

src/maasserver/api/tests/test_api.py

src/maasserver/bootresources.py

src/maasserver/dhcp.py

src/maasserver/dns/tests/test_zonegenerator.py

src/maasserver/dns/zonegenerator.py

src/maasserver/fields.py

src/maasserver/forms_interface_link.py

src/maasserver/forms_settings.py

src/maasserver/management/commands/apikey.py

src/maasserver/migrations/builtin/maasserver/0092_rolling.py

src/maasserver/models/bootresource.py

src/maasserver/models/signals/bootsources.py

src/maasserver/models/signals/tests/test_bootsources.py

src/maasserver/models/tests/test_bootresource.py

src/maasserver/models/user.py

src/maasserver/models/userprofile.py

src/maasserver/populate_tags.py

src/maasserver/rpc/rackcontrollers.py

src/maasserver/rpc/regionservice.py

src/maasserver/rpc/tests/test_rackcontrollers.py

src/maasserver/rpc/tests/test_regionservice.py

src/maasserver/static/js/angular/controllers/networks_list.js

src/maasserver/static/js/angular/controllers/tests/test_networks_list.js

src/maasserver/static/js/angular/directives/boot_images.js

src/maasserver/static/js/angular/directives/tests/test_boot_images.js

src/maasserver/static/js/angular/maas.js

src/maasserver/static/partials/boot-images.html

src/maasserver/static/partials/dashboard.html

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

src/maasserver/testing/factory.py

src/maasserver/tests/test_bootresources.py

src/maasserver/tests/test_commands.py

src/maasserver/tests/test_fields.py

src/maasserver/tests/test_forms_interface_link.py

src/maasserver/tests/test_populate_tags.py

src/maasserver/triggers/system.py

src/maasserver/triggers/tests/test_system_listener.py

src/maasserver/triggers/tests/test_websocket.py

src/maasserver/triggers/tests/test_websocket_listener.py

src/maasserver/triggers/websocket.py

src/maasserver/utils/threads.py

src/provisioningserver/import_images/download_resources.py

src/provisioningserver/import_images/tests/test_download_resources.py

src/provisioningserver/monkey.py

src/provisioningserver/tests/test_monkey.py

src/provisioningserver/utils/tests/test_twisted.py

src/provisioningserver/utils/twisted.py

Older »