← Back to branch summary

~allenap/maas/duplicate-vlan-on-start--bug-1583333

~allenap/maas/duplicate-vlan-on-start--bug-1583333

Viewing all changes in revision 5059.

Committer: Gavin Panella
Date: 2016-05-31 19:15:43 UTC
mfrom: (5050.1.5 maas)
Revision ID: gavin.panella@canonical.com-20160531191543-xkc3267agjrjl1rn

Merged trunk into duplicate-vlan-on-start--bug-1583333.

files added:
src/maasserver/migrations/builtin/maasserver/0062_fix_bootsource_daily_label.py

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

files modified:
src/maasserver/api/tests/test_boot_source_selections.py

src/maasserver/api/tests/test_boot_sources.py

src/maasserver/bootresources.py

src/maasserver/bootsources.py

src/maasserver/clusterrpc/tests/test_boot_images.py

src/maasserver/migrations/builtin/maasserver/0061_maas_nodegroup_worker_to_maas.py

src/maasserver/models/node.py

src/maasserver/models/signals/bootsources.py

src/maasserver/models/staticipaddress.py

src/maasserver/models/testing.py

src/maasserver/models/tests/test_bootresource.py

src/maasserver/models/tests/test_bootsource.py

src/maasserver/models/tests/test_bootsourcecache.py

src/maasserver/models/tests/test_bootsourceselection.py

src/maasserver/models/tests/test_node.py

src/maasserver/models/tests/test_staticipaddress.py

src/maasserver/rpc/rackcontrollers.py

src/maasserver/rpc/tests/test_configuration.py

src/maasserver/rpc/tests/test_rackcontrollers.py

src/maasserver/rpc/tests/test_regionservice_calls.py

src/maasserver/start_up.py

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

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

src/maasserver/tests/test_bootresources.py

src/maasserver/tests/test_bootsources.py

src/maasserver/tests/test_compose_preseed.py

src/maasserver/tests/test_forms_bootsource.py

src/maasserver/tests/test_forms_bootsourceselection.py

src/maasserver/tests/test_service_monitor.py

src/maasserver/tests/test_start_up.py

src/maasserver/triggers/tests/test_websocket_listener.py

src/maasserver/triggers/websocket.py

src/maasserver/views/tests/test_images.py

src/maasserver/views/tests/test_settings.py

Show diffs side-by-side

added added

removed removed

src/maasserver/api/tests/test_boot_source_selections.py

src/maasserver/api/tests/test_boot_sources.py

src/maasserver/bootresources.py

src/maasserver/bootsources.py

src/maasserver/clusterrpc/tests/test_boot_images.py

src/maasserver/migrations/builtin/maasserver/0061_maas_nodegroup_worker_to_maas.py

src/maasserver/migrations/builtin/maasserver/0062_fix_bootsource_daily_label.py

src/maasserver/models/node.py

src/maasserver/models/signals/bootsources.py

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

src/maasserver/models/staticipaddress.py

src/maasserver/models/testing.py

src/maasserver/models/tests/test_bootresource.py

src/maasserver/models/tests/test_bootsource.py

src/maasserver/models/tests/test_bootsourcecache.py

src/maasserver/models/tests/test_bootsourceselection.py

src/maasserver/models/tests/test_node.py

src/maasserver/models/tests/test_staticipaddress.py

src/maasserver/rpc/rackcontrollers.py

src/maasserver/rpc/tests/test_configuration.py

src/maasserver/rpc/tests/test_rackcontrollers.py

src/maasserver/rpc/tests/test_regionservice_calls.py

src/maasserver/start_up.py

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

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

src/maasserver/tests/test_bootresources.py

src/maasserver/tests/test_bootsources.py

src/maasserver/tests/test_compose_preseed.py

src/maasserver/tests/test_forms_bootsource.py

src/maasserver/tests/test_forms_bootsourceselection.py

src/maasserver/tests/test_service_monitor.py

src/maasserver/tests/test_start_up.py

src/maasserver/triggers/tests/test_websocket_listener.py

src/maasserver/triggers/websocket.py

src/maasserver/views/tests/test_images.py

src/maasserver/views/tests/test_settings.py

Older »