← Back to branch summary

~andreserl/maas/lp_1459865

~andreserl/maas/lp_1459865

Viewing all changes in revision 4174.

Committer: MAAS Lander
Author(s): Mike Pontillo, Raphael Badin, LaMont Jones
Date: 2015-08-10 15:13:54 UTC
mfrom: (4120.1.11 networking-trunk-merge)
Revision ID: maas_lander-20150810151354-zljzd7sakbbdjtgk

[r=mpontillo][bug=][author=mpontillo] Merge networking feature branch back to trunk.

files added:
src/maasserver/migrations/0159_remove_nodegroupinterface_unused_fields.py

files renamed:
src/metadataserver/models/tests/test_noderesults.py => src/metadataserver/models/tests/test_commissioningscript.py

files modified:
src/maasserver/api/node_group_interfaces.py

src/maasserver/api/tests/test_events.py

src/maasserver/clusterrpc/dhcp.py

src/maasserver/clusterrpc/tests/test_dhcp.py

src/maasserver/dhcp.py

src/maasserver/enum.py

src/maasserver/fixtures/dev_fixture.yaml

src/maasserver/forms.py

src/maasserver/migrations/0140_create_default_fabric_vlan.py

src/maasserver/models/__init__.py

src/maasserver/models/interface.py

src/maasserver/models/macaddress.py

src/maasserver/models/migrations/populate_subnets_helper.py

src/maasserver/models/migrations/tests/test_populate_subnets_helper.py

src/maasserver/models/node.py

src/maasserver/models/nodegroup.py

src/maasserver/models/nodegroupinterface.py

src/maasserver/models/signals/dhcp.py

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

src/maasserver/models/staticipaddress.py

src/maasserver/models/subnet.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_nodegroup.py

src/maasserver/models/tests/test_nodegroupinterface.py

src/maasserver/models/tests/test_staticipaddress.py

src/maasserver/models/tests/test_subnet.py

src/maasserver/networking_preseed.py

src/maasserver/rpc/leases.py

src/maasserver/rpc/tests/test_regionservice.py

src/maasserver/start_up.py

src/maasserver/testing/factory.py

src/maasserver/tests/test_forms_nodegroupinterface.py

src/maasserver/tests/test_forms_validate_nonoverlapping_networks.py

src/maasserver/utils/__init__.py

src/maasserver/views/tests/test_clusters.py

src/maasserver/websockets/handlers/cluster.py

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

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

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

src/metadataserver/models/commissioningscript.py

src/provisioningserver/dhcp/leases_parser.py

src/provisioningserver/dhcp/leases_parser_fast.py

src/provisioningserver/dhcp/omshell.py

src/provisioningserver/dhcp/tests/test_leases_parser.py

src/provisioningserver/dhcp/tests/test_omshell.py

src/provisioningserver/rpc/clusterservice.py

src/provisioningserver/rpc/dhcp.py

src/provisioningserver/rpc/tests/test_dhcp.py

src/provisioningserver/utils/network.py

Show diffs side-by-side

added added

removed removed

src/maasserver/api/node_group_interfaces.py

src/maasserver/api/tests/test_events.py

src/maasserver/clusterrpc/dhcp.py

src/maasserver/clusterrpc/tests/test_dhcp.py

src/maasserver/dhcp.py

src/maasserver/enum.py

src/maasserver/fixtures/dev_fixture.yaml

src/maasserver/forms.py

src/maasserver/migrations/0140_create_default_fabric_vlan.py

src/maasserver/migrations/0159_remove_nodegroupinterface_unused_fields.py

src/maasserver/models/__init__.py

src/maasserver/models/interface.py

src/maasserver/models/macaddress.py

src/maasserver/models/migrations/populate_subnets_helper.py

src/maasserver/models/migrations/tests/test_populate_subnets_helper.py

src/maasserver/models/node.py

src/maasserver/models/nodegroup.py

src/maasserver/models/nodegroupinterface.py

src/maasserver/models/signals/dhcp.py

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

src/maasserver/models/staticipaddress.py

src/maasserver/models/subnet.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_nodegroup.py

src/maasserver/models/tests/test_nodegroupinterface.py

src/maasserver/models/tests/test_staticipaddress.py

src/maasserver/models/tests/test_subnet.py

src/maasserver/networking_preseed.py

src/maasserver/rpc/leases.py

src/maasserver/rpc/tests/test_regionservice.py

src/maasserver/start_up.py

src/maasserver/testing/factory.py

src/maasserver/tests/test_forms_nodegroupinterface.py

src/maasserver/tests/test_forms_validate_nonoverlapping_networks.py

src/maasserver/utils/__init__.py

src/maasserver/views/tests/test_clusters.py

src/maasserver/websockets/handlers/cluster.py

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

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

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

src/metadataserver/models/commissioningscript.py

src/metadataserver/models/tests/test_commissioningscript.py

src/provisioningserver/dhcp/leases_parser.py

src/provisioningserver/dhcp/leases_parser_fast.py

src/provisioningserver/dhcp/omshell.py

src/provisioningserver/dhcp/tests/test_leases_parser.py

src/provisioningserver/dhcp/tests/test_omshell.py

src/provisioningserver/rpc/clusterservice.py

src/provisioningserver/rpc/dhcp.py

src/provisioningserver/rpc/tests/test_dhcp.py

src/provisioningserver/utils/network.py

Older »