← Back to branch summary

~ricgard/maas/node-details-design-amednments

~ricgard/maas/node-details-design-amednments

Viewing all changes in revision 4020.

Committer: ricgard
Date: 2015-06-17 17:05:03 UTC
mfrom: (4018.1.13 maas)
Revision ID: richard.mccartney@canonical.com-20150617170503-w9qvme6nxw79ebq6

merging trunk

files added:
src/maasserver/api/partitions.py

src/maasserver/api/tests/test_partitions.py

src/maasserver/forms_interface.py

src/maasserver/migrations/0140_create_default_fabric_vlan.py

src/maasserver/migrations/0141_add_interface.py

src/maasserver/migrations/0142_add_space_subnet.py

src/maasserver/migrations/0143_create_default_space.py

src/maasserver/models/space.py

src/maasserver/models/subnet.py

src/maasserver/models/tests/test_space.py

src/maasserver/models/tests/test_subnet.py

src/maasserver/tests/test_forms_interface.py

src/maasserver/utils/iplink.py

src/maasserver/utils/tests/test_iplink.py

files removed:
src/maasserver/migrations/0140_add_interface.py

files modified:
etc/maas/templates/deployment-user-data/maas_configure_interfaces.py

src/maasserver/api/devices.py

src/maasserver/api/ip_addresses.py

src/maasserver/api/nodegroups.py

src/maasserver/api/nodes.py

src/maasserver/api/tests/test_devices.py

src/maasserver/api/tests/test_ipaddresses.py

src/maasserver/api/tests/test_node.py

src/maasserver/api/tests/test_nodegroup.py

src/maasserver/fields.py

src/maasserver/migrations/0139_add_vlan_fabric.py

src/maasserver/models/__init__.py

src/maasserver/models/fabric.py

src/maasserver/models/interface.py

src/maasserver/models/macaddress.py

src/maasserver/models/macipaddresslink.py

src/maasserver/models/node.py

src/maasserver/models/nodegroupinterface.py

src/maasserver/models/partitiontable.py

src/maasserver/models/signals/dns.py

src/maasserver/models/tests/test_fabric.py

src/maasserver/models/tests/test_interface.py

src/maasserver/models/tests/test_macaddress.py

src/maasserver/models/tests/test_node.py

src/maasserver/models/tests/test_partitiontable.py

src/maasserver/models/tests/test_vlan.py

src/maasserver/models/vlan.py

src/maasserver/testing/factory.py

src/maasserver/tests/models.py

src/maasserver/tests/test_fields.py

src/maasserver/urls_api.py

src/maasserver/utils/converters.py

src/maasserver/utils/tests/test_converters.py

src/maasserver/websockets/handlers/device.py

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

src/maastesting/factory.py

src/maastesting/testcase.py

src/metadataserver/models/commissioningscript.py

src/metadataserver/models/tests/ip_link_results.txt

src/metadataserver/models/tests/test_noderesults.py

src/provisioningserver/import_images/tests/test_uec2roottar.py

src/provisioningserver/import_images/uec2roottar.py

src/provisioningserver/rpc/tests/test_clusterservice.py

Show diffs side-by-side

added added

removed removed

etc/maas/templates/deployment-user-data/maas_configure_interfaces.py

src/maasserver/api/devices.py

src/maasserver/api/ip_addresses.py

src/maasserver/api/nodegroups.py

src/maasserver/api/nodes.py

src/maasserver/api/partitions.py

src/maasserver/api/tests/test_devices.py

src/maasserver/api/tests/test_ipaddresses.py

src/maasserver/api/tests/test_node.py

src/maasserver/api/tests/test_nodegroup.py

src/maasserver/api/tests/test_partitions.py

src/maasserver/fields.py

src/maasserver/forms_interface.py

src/maasserver/migrations/0139_add_vlan_fabric.py

src/maasserver/migrations/0140_add_interface.py

src/maasserver/migrations/0140_create_default_fabric_vlan.py

src/maasserver/migrations/0141_add_interface.py

src/maasserver/migrations/0142_add_space_subnet.py

src/maasserver/migrations/0143_create_default_space.py

src/maasserver/models/__init__.py

src/maasserver/models/fabric.py

src/maasserver/models/interface.py

src/maasserver/models/macaddress.py

src/maasserver/models/macipaddresslink.py

src/maasserver/models/node.py

src/maasserver/models/nodegroupinterface.py

src/maasserver/models/partitiontable.py

src/maasserver/models/signals/dns.py

src/maasserver/models/space.py

src/maasserver/models/subnet.py

src/maasserver/models/tests/test_fabric.py

src/maasserver/models/tests/test_interface.py

src/maasserver/models/tests/test_macaddress.py

src/maasserver/models/tests/test_node.py

src/maasserver/models/tests/test_partitiontable.py

src/maasserver/models/tests/test_space.py

src/maasserver/models/tests/test_subnet.py

src/maasserver/models/tests/test_vlan.py

src/maasserver/models/vlan.py

src/maasserver/testing/factory.py

src/maasserver/tests/models.py

src/maasserver/tests/test_fields.py

src/maasserver/tests/test_forms_interface.py

src/maasserver/urls_api.py

src/maasserver/utils/converters.py

src/maasserver/utils/iplink.py

src/maasserver/utils/tests/test_converters.py

src/maasserver/utils/tests/test_iplink.py

src/maasserver/websockets/handlers/device.py

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

src/maastesting/factory.py

src/maastesting/testcase.py

src/metadataserver/models/commissioningscript.py

src/metadataserver/models/tests/ip_link_results.txt

src/metadataserver/models/tests/test_noderesults.py

src/provisioningserver/import_images/tests/test_uec2roottar.py

src/provisioningserver/import_images/uec2roottar.py

src/provisioningserver/rpc/tests/test_clusterservice.py

Older »