← Back to branch summary

~newell-jensen/maas/prefix-filter-virsh-bug-1393423

~newell-jensen/maas/prefix-filter-virsh-bug-1393423

Viewing all changes in revision 3379.

Committer: Newell Jensen
Date: 2014-12-03 18:03:37 UTC
mfrom: (3377.2.21 maas)
Revision ID: newell.jensen@canonical.com-20141203180337-jz4qoik6333pw7dg

Merge with trunk. Fix conflicts.

files added:
src/maasserver/fixtures/candidatenames.yaml

src/maasserver/fixtures/defaultzone.yaml

src/maasserver/migrations/0119_migrate_invalid_network_names.py

src/maasserver/migrations/0120_make_macaddress_node_nullable.py

src/maasserver/utils/tests/test_views.py

src/maasserver/utils/views.py

files removed:
src/maasserver/tests/test_configuration.py

files modified:
contrib/maas_local_settings.py

src/maas/__init__.py

src/maas/customise_test_db.py

src/maas/development.py

src/maas/settings.py

src/maas/tests/test_maas.py

src/maasserver/api/boot_resources.py

src/maasserver/api/boot_source_selections.py

src/maasserver/api/boot_sources.py

src/maasserver/api/files.py

src/maasserver/api/ip_addresses.py

src/maasserver/api/license_keys.py

src/maasserver/api/maas.py

src/maasserver/api/networks.py

src/maasserver/api/node_group_interfaces.py

src/maasserver/api/node_groups.py

src/maasserver/api/node_macs.py

src/maasserver/api/nodes.py

src/maasserver/api/pxeconfig.py

src/maasserver/api/ssh_keys.py

src/maasserver/api/ssl_keys.py

src/maasserver/api/support.py

src/maasserver/api/tags.py

src/maasserver/api/tests/test_enlistment.py

src/maasserver/api/tests/test_ipaddresses.py

src/maasserver/api/tests/test_network.py

src/maasserver/api/tests/test_networks.py

src/maasserver/api/tests/test_nodes.py

src/maasserver/api/tests/test_pxeconfig.py

src/maasserver/api/tests/test_support.py

src/maasserver/api/users.py

src/maasserver/api/utils.py

src/maasserver/api/zones.py

src/maasserver/clusterrpc/power.py

src/maasserver/exceptions.py

src/maasserver/forms.py

src/maasserver/models/eventtype.py

src/maasserver/models/largefile.py

src/maasserver/models/licensekey.py

src/maasserver/models/macaddress.py

src/maasserver/models/network.py

src/maasserver/models/node.py

src/maasserver/models/tests/test_dhcplease.py

src/maasserver/models/tests/test_eventtype.py

src/maasserver/models/tests/test_macaddress.py

src/maasserver/models/tests/test_network.py

src/maasserver/models/tests/test_node.py

src/maasserver/rpc/testing/fixtures.py

src/maasserver/rpc/tests/test_nodes.py

src/maasserver/rpc/tests/test_regionservice.py

src/maasserver/security.py

src/maasserver/templates/maasserver/nodegroup_edit.html

src/maasserver/testing/factory.py

src/maasserver/testing/testcase.py

src/maasserver/tests/models.py

src/maasserver/tests/test_exceptions.py

src/maasserver/tests/test_fields.py

src/maasserver/tests/test_forms_helpers.py

src/maasserver/tests/test_forms_macaddress.py

src/maasserver/tests/test_forms_network.py

src/maasserver/tests/test_networking_preseed.py

src/maasserver/tests/test_node_constraint_filter_forms.py

src/maasserver/urls.py

src/maasserver/urls_api.py

src/maasserver/utils/async.py

src/maasserver/utils/orm.py

src/maasserver/utils/tests/test_async.py

src/maasserver/utils/tests/test_orm.py

src/maasserver/views/tests/test_networks.py

src/maasserver/views/tests/test_nodes.py

src/maasserver/views/tests/test_rpc.py

src/maastesting/djangotestcase.py

src/metadataserver/tests/test_api.py

src/metadataserver/urls.py

src/provisioningserver/boot/__init__.py

src/provisioningserver/boot/powernv.py

src/provisioningserver/boot/pxe.py

src/provisioningserver/boot/uefi.py

src/provisioningserver/boot/utils.py

src/provisioningserver/boot/windows.py

src/provisioningserver/drivers/diskless/__init__.py

src/provisioningserver/drivers/hardware/seamicro.py

src/provisioningserver/drivers/hardware/virsh.py

src/provisioningserver/drivers/osystem/__init__.py

src/provisioningserver/drivers/power/__init__.py

src/provisioningserver/power/poweraction.py

src/provisioningserver/rpc/osystems.py

src/provisioningserver/rpc/power.py

src/provisioningserver/rpc/testing/__init__.py

src/provisioningserver/rpc/tests/test_power.py

src/provisioningserver/security.py

src/provisioningserver/utils/__init__.py

src/provisioningserver/utils/text.py

Show diffs side-by-side

added added

removed removed

contrib/maas_local_settings.py

src/maas/__init__.py

src/maas/customise_test_db.py

src/maas/development.py

src/maas/settings.py

src/maas/tests/test_maas.py

src/maasserver/api/boot_resources.py

src/maasserver/api/boot_source_selections.py

src/maasserver/api/boot_sources.py

src/maasserver/api/files.py

src/maasserver/api/ip_addresses.py

src/maasserver/api/license_keys.py

src/maasserver/api/maas.py

src/maasserver/api/networks.py

src/maasserver/api/node_group_interfaces.py

src/maasserver/api/node_groups.py

src/maasserver/api/node_macs.py

src/maasserver/api/nodes.py

src/maasserver/api/pxeconfig.py

src/maasserver/api/ssh_keys.py

src/maasserver/api/ssl_keys.py

src/maasserver/api/support.py

src/maasserver/api/tags.py

src/maasserver/api/tests/test_enlistment.py

src/maasserver/api/tests/test_ipaddresses.py

src/maasserver/api/tests/test_network.py

src/maasserver/api/tests/test_networks.py

src/maasserver/api/tests/test_nodes.py

src/maasserver/api/tests/test_pxeconfig.py

src/maasserver/api/tests/test_support.py

src/maasserver/api/users.py

src/maasserver/api/utils.py

src/maasserver/api/zones.py

src/maasserver/clusterrpc/power.py

src/maasserver/exceptions.py

src/maasserver/fixtures/candidatenames.yaml

src/maasserver/fixtures/defaultzone.yaml

src/maasserver/forms.py

src/maasserver/migrations/0119_migrate_invalid_network_names.py

src/maasserver/migrations/0120_make_macaddress_node_nullable.py

src/maasserver/models/eventtype.py

src/maasserver/models/largefile.py

src/maasserver/models/licensekey.py

src/maasserver/models/macaddress.py

src/maasserver/models/network.py

src/maasserver/models/node.py

src/maasserver/models/tests/test_dhcplease.py

src/maasserver/models/tests/test_eventtype.py

src/maasserver/models/tests/test_macaddress.py

src/maasserver/models/tests/test_network.py

src/maasserver/models/tests/test_node.py

src/maasserver/rpc/testing/fixtures.py

src/maasserver/rpc/tests/test_nodes.py

src/maasserver/rpc/tests/test_regionservice.py

src/maasserver/security.py

src/maasserver/templates/maasserver/nodegroup_edit.html

src/maasserver/testing/factory.py

src/maasserver/testing/testcase.py

src/maasserver/tests/models.py

src/maasserver/tests/test_configuration.py

src/maasserver/tests/test_exceptions.py

src/maasserver/tests/test_fields.py

src/maasserver/tests/test_forms_helpers.py

src/maasserver/tests/test_forms_macaddress.py

src/maasserver/tests/test_forms_network.py

src/maasserver/tests/test_networking_preseed.py

src/maasserver/tests/test_node_constraint_filter_forms.py

src/maasserver/urls.py

src/maasserver/urls_api.py

src/maasserver/utils/async.py

src/maasserver/utils/orm.py

src/maasserver/utils/tests/test_async.py

src/maasserver/utils/tests/test_orm.py

src/maasserver/utils/tests/test_views.py

src/maasserver/utils/views.py

src/maasserver/views/tests/test_networks.py

src/maasserver/views/tests/test_nodes.py

src/maasserver/views/tests/test_rpc.py

src/maastesting/djangotestcase.py

src/metadataserver/tests/test_api.py

src/metadataserver/urls.py

src/provisioningserver/boot/__init__.py

src/provisioningserver/boot/powernv.py

src/provisioningserver/boot/pxe.py

src/provisioningserver/boot/uefi.py

src/provisioningserver/boot/utils.py

src/provisioningserver/boot/windows.py

src/provisioningserver/drivers/diskless/__init__.py

src/provisioningserver/drivers/hardware/seamicro.py

src/provisioningserver/drivers/hardware/virsh.py

src/provisioningserver/drivers/osystem/__init__.py

src/provisioningserver/drivers/power/__init__.py

src/provisioningserver/power/poweraction.py

src/provisioningserver/rpc/osystems.py

src/provisioningserver/rpc/power.py

src/provisioningserver/rpc/testing/__init__.py

src/provisioningserver/rpc/tests/test_power.py

src/provisioningserver/security.py

src/provisioningserver/utils/__init__.py

src/provisioningserver/utils/text.py

Older »