← Back to branch summary

~allenap/maas/wait-for-dns-update--bug-1550540

~allenap/maas/wait-for-dns-update--bug-1550540

Viewing all changes in revision 4675.2.2.

Committer: LaMont Jones
Date: 2016-02-25 16:13:34 UTC
mfrom: (4684 maas)
mto: This revision was merged to the branch mainline in revision 4689.
Revision ID: lamont@canonical.com-20160225161334-7a52xujm19z83dfe

merge from trunk

files added:
src/maasserver/management/commands/generate_sample_data.py

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

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

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

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

src/maasserver/static/js/angular/factories/machines.js

src/maasserver/static/js/angular/factories/tests/test_controllers.js

src/maasserver/static/js/angular/factories/tests/test_nodes.js

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

src/maasserver/testing/sampledata.py

src/maasserver/testing/tests/test_sampledata.py

files removed:
src/maasserver/fixtures/dev_fixture.yaml

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

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

src/maasserver/static/js/angular/factories/tests/test_controllers.js

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

src/provisioningserver/drivers/hardware/mscm.py

src/provisioningserver/drivers/hardware/tests/test_mscm.py

files renamed:
src/maasserver/static/js/angular/factories/machines.js => src/maasserver/static/js/angular/factories/nodes.js

files modified:
Makefile

docs/changelog.rst

required-packages/base

src/maasserver/api/tests/test_pxeconfig.py

src/maasserver/dns/tests/test_config.py

src/maasserver/models/node.py

src/maasserver/models/partition.py

src/maasserver/models/partitiontable.py

src/maasserver/models/tests/test_node.py

src/maasserver/models/tests/test_partition.py

src/maasserver/models/tests/test_partitiontable.py

src/maasserver/models/tests/test_staticipaddress.py

src/maasserver/models/tests/test_subnet.py

src/maasserver/preseed_storage.py

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

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

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

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

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

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

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

src/maasserver/static/js/angular/factories/tests/test_machines.js

src/maasserver/static/js/angular/filters/by_vlan.js

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

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

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

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

src/maasserver/storage_layouts.py

src/maasserver/testing/orm.py

src/maasserver/tests/test_bootsources.py

src/maasserver/tests/test_preseed_storage.py

src/maasserver/tests/test_storage_layouts.py

src/maasserver/views/combo.py

src/maasserver/websockets/handlers/controller.py

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

src/maasserver/websockets/handlers/vlan.py

src/metadataserver/api.py

src/provisioningserver/boot/powerkvm.py

src/provisioningserver/boot/powernv.py

src/provisioningserver/drivers/power/mscm.py

src/provisioningserver/drivers/power/tests/test_mscm.py

src/provisioningserver/rpc/clusterservice.py

utilities/remote-reinstall

Show diffs side-by-side

added added

removed removed

docs/changelog.rst

required-packages/base

src/maasserver/api/tests/test_pxeconfig.py

src/maasserver/dns/tests/test_config.py

src/maasserver/fixtures/dev_fixture.yaml

src/maasserver/management/commands/generate_sample_data.py

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

src/maasserver/models/node.py

src/maasserver/models/partition.py

src/maasserver/models/partitiontable.py

src/maasserver/models/tests/test_node.py

src/maasserver/models/tests/test_partition.py

src/maasserver/models/tests/test_partitiontable.py

src/maasserver/models/tests/test_staticipaddress.py

src/maasserver/models/tests/test_subnet.py

src/maasserver/preseed_storage.py

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

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

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

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

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

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

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

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

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

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

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

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

src/maasserver/static/js/angular/factories/machines.js

src/maasserver/static/js/angular/factories/nodes.js

src/maasserver/static/js/angular/factories/tests/test_controllers.js

src/maasserver/static/js/angular/factories/tests/test_controllers.js

src/maasserver/static/js/angular/factories/tests/test_machines.js

src/maasserver/static/js/angular/factories/tests/test_nodes.js

src/maasserver/static/js/angular/filters/by_vlan.js

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

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

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

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

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

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

src/maasserver/storage_layouts.py

src/maasserver/testing/orm.py

src/maasserver/testing/sampledata.py

src/maasserver/testing/tests/test_sampledata.py

src/maasserver/tests/test_bootsources.py

src/maasserver/tests/test_preseed_storage.py

src/maasserver/tests/test_storage_layouts.py

src/maasserver/views/combo.py

src/maasserver/websockets/handlers/controller.py

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

src/maasserver/websockets/handlers/vlan.py

src/metadataserver/api.py

src/provisioningserver/boot/powerkvm.py

src/provisioningserver/boot/powernv.py

src/provisioningserver/drivers/hardware/mscm.py

src/provisioningserver/drivers/hardware/tests/test_mscm.py

src/provisioningserver/drivers/power/mscm.py

src/provisioningserver/drivers/power/tests/test_mscm.py

src/provisioningserver/rpc/clusterservice.py

utilities/remote-reinstall

Older »