← Back to branch summary

~blake-rouse/maas/fix-1484696

~blake-rouse/maas/fix-1484696

Viewing all changes in revision 4288.1.2.

Committer: Jeffrey C Jones
Date: 2015-09-23 01:01:49 UTC
mfrom: (4293 maas)
mto: This revision was merged to the branch mainline in revision 4294.
Revision ID: jeff.jones@canonical.com-20150923010149-x0r6ym7dx014e370

merge trunk

files added:
src/maasserver/concurrency.py

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

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

src/maasserver/utils/tests/test_threads.py

src/maasserver/utils/threads.py

files modified:
buildout.cfg

src/maas/development.py

src/maasserver/__init__.py

src/maasserver/api/subnets.py

src/maasserver/api/support.py

src/maasserver/api/tests/test_boot_resources.py

src/maasserver/api/tests/test_subnets.py

src/maasserver/bootresources.py

src/maasserver/bootsources.py

src/maasserver/components.py

src/maasserver/context_processors.py

src/maasserver/dhcp.py

src/maasserver/dns/config.py

src/maasserver/forms.py

src/maasserver/models/bootsource.py

src/maasserver/models/largefile.py

src/maasserver/models/node.py

src/maasserver/models/nodegroupinterface.py

src/maasserver/models/signals/power.py

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

src/maasserver/models/staticipaddress.py

src/maasserver/models/subnet.py

src/maasserver/models/tests/test_bootsource.py

src/maasserver/models/tests/test_largefile.py

src/maasserver/models/tests/test_node.py

src/maasserver/models/tests/test_nodegroupinterface.py

src/maasserver/nonces_cleanup.py

src/maasserver/plugin.py

src/maasserver/rpc/regionservice.py

src/maasserver/rpc/tests/test_monitors.py

src/maasserver/rpc/tests/test_regionservice.py

src/maasserver/security.py

src/maasserver/start_up.py

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

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

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

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

src/maasserver/testing/__init__.py

src/maasserver/tests/test_bootresources.py

src/maasserver/tests/test_eventloop.py

src/maasserver/tests/test_nonces_cleanup.py

src/maasserver/tests/test_plugin.py

src/maasserver/tests/test_start_up.py

src/maasserver/tests/test_webapp.py

src/maasserver/utils/orm.py

src/maasserver/utils/tests/test_async.py

src/maasserver/utils/tests/test_orm.py

src/maasserver/views/tests/test_rpc.py

src/maasserver/webapp.py

src/maasserver/websockets/base.py

src/maasserver/websockets/handlers/node.py

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

src/maasserver/websockets/listener.py

src/maasserver/websockets/protocol.py

src/maasserver/websockets/tests/test_base.py

src/maasserver/websockets/tests/test_listener.py

src/maasserver/websockets/tests/test_protocol.py

src/maastesting/factory.py

src/maastesting/noseplug.py

src/maastesting/tests/test_noseplug.py

src/provisioningserver/utils/network.py

src/provisioningserver/utils/tests/test_twisted.py

src/provisioningserver/utils/twisted.py

Show diffs side-by-side

added added

removed removed

src/maas/development.py

src/maasserver/__init__.py

src/maasserver/api/subnets.py

src/maasserver/api/support.py

src/maasserver/api/tests/test_boot_resources.py

src/maasserver/api/tests/test_subnets.py

src/maasserver/bootresources.py

src/maasserver/bootsources.py

src/maasserver/components.py

src/maasserver/concurrency.py

src/maasserver/context_processors.py

src/maasserver/dhcp.py

src/maasserver/dns/config.py

src/maasserver/forms.py

src/maasserver/models/bootsource.py

src/maasserver/models/largefile.py

src/maasserver/models/node.py

src/maasserver/models/nodegroupinterface.py

src/maasserver/models/signals/power.py

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

src/maasserver/models/staticipaddress.py

src/maasserver/models/subnet.py

src/maasserver/models/tests/test_bootsource.py

src/maasserver/models/tests/test_largefile.py

src/maasserver/models/tests/test_node.py

src/maasserver/models/tests/test_nodegroupinterface.py

src/maasserver/nonces_cleanup.py

src/maasserver/plugin.py

src/maasserver/rpc/regionservice.py

src/maasserver/rpc/tests/test_monitors.py

src/maasserver/rpc/tests/test_regionservice.py

src/maasserver/security.py

src/maasserver/start_up.py

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

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

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

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

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

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

src/maasserver/testing/__init__.py

src/maasserver/tests/test_bootresources.py

src/maasserver/tests/test_eventloop.py

src/maasserver/tests/test_nonces_cleanup.py

src/maasserver/tests/test_plugin.py

src/maasserver/tests/test_start_up.py

src/maasserver/tests/test_webapp.py

src/maasserver/utils/orm.py

src/maasserver/utils/tests/test_async.py

src/maasserver/utils/tests/test_orm.py

src/maasserver/utils/tests/test_threads.py

src/maasserver/utils/threads.py

src/maasserver/views/tests/test_rpc.py

src/maasserver/webapp.py

src/maasserver/websockets/base.py

src/maasserver/websockets/handlers/node.py

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

src/maasserver/websockets/listener.py

src/maasserver/websockets/protocol.py

src/maasserver/websockets/tests/test_base.py

src/maasserver/websockets/tests/test_listener.py

src/maasserver/websockets/tests/test_protocol.py

src/maastesting/factory.py

src/maastesting/noseplug.py

src/maastesting/tests/test_noseplug.py

src/provisioningserver/utils/network.py

src/provisioningserver/utils/tests/test_twisted.py

src/provisioningserver/utils/twisted.py

Older »