← Back to branch summary

~blake-rouse/maas/fix-1640300

~blake-rouse/maas/fix-1640300

Viewing all changes in revision 4824.5.12.

Committer: LaMont Jones
Date: 2016-03-28 13:54:47 UTC
mfrom: (4844 maas)
mto: (4824.5.17 proxy-template)
mto: This revision was merged to the branch mainline in revision 4862.
Revision ID: lamont@canonical.com-20160328135447-cxpqzhcjcvsmgvvr

merge trunk

files modified:
src/maasserver/dhcp.py

src/maasserver/migrations/south/django16_south_maas19.tar.gz

src/maasserver/migrations/south/migrations/0188_dli_power_driver_system_id_to_outlet_id.py

src/maasserver/models/node.py

src/maasserver/models/tests/test_node.py

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

src/maasserver/static/js/angular/controllers/tests/test_domain_details.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/tests/test_vlans.js

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

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

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

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

src/maasserver/tests/test_dhcp.py

src/maasserver/websockets/handlers/domain.py

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

src/provisioningserver/dhcp/testing/config.py

src/provisioningserver/dhcp/tests/test_config.py

src/provisioningserver/rpc/cluster.py

src/provisioningserver/rpc/clusterservice.py

src/provisioningserver/rpc/dhcp.py

src/provisioningserver/rpc/tests/test_clusterservice.py

src/provisioningserver/rpc/tests/test_dhcp.py

src/provisioningserver/templates/dhcp/dhcpd.conf.template

src/provisioningserver/templates/dhcp/dhcpd6.conf.template

Show diffs side-by-side

added added

removed removed

src/maasserver/dhcp.py

src/maasserver/migrations/south/django16_south_maas19.tar.gz

src/maasserver/migrations/south/migrations/0188_dli_power_driver_system_id_to_outlet_id.py

src/maasserver/models/node.py

src/maasserver/models/tests/test_node.py

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

src/maasserver/static/js/angular/controllers/tests/test_domain_details.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/tests/test_vlans.js

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

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

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

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

src/maasserver/tests/test_dhcp.py

src/maasserver/websockets/handlers/domain.py

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

src/provisioningserver/dhcp/testing/config.py

src/provisioningserver/dhcp/tests/test_config.py

src/provisioningserver/rpc/cluster.py

src/provisioningserver/rpc/clusterservice.py

src/provisioningserver/rpc/dhcp.py

src/provisioningserver/rpc/tests/test_clusterservice.py

src/provisioningserver/rpc/tests/test_dhcp.py

src/provisioningserver/templates/dhcp/dhcpd.conf.template

src/provisioningserver/templates/dhcp/dhcpd6.conf.template

Older »