← Back to branch summary

~cerberus/nova/disk_config

~cerberus/nova/disk_config

Viewing all changes in revision 1525.

Committer: matt.dietz at rackspace
Date: 2011-09-19 01:27:16 UTC
mfrom: (1511.1.78 nova)
Revision ID: matt.dietz@rackspace.com-20110919012716-9skewfhjxza39x7g

Merge from trunk and migration renumbering

files added:
nova/api/openstack/contrib/flavorextradata.py

nova/api/openstack/schemas/v1.1/addresses.rng

nova/api/openstack/schemas/v1.1/flavor.rng

nova/api/openstack/schemas/v1.1/flavors.rng

nova/api/openstack/schemas/v1.1/flavors_index.rng

nova/api/openstack/schemas/v1.1/image.rng

nova/api/openstack/schemas/v1.1/images.rng

nova/api/openstack/schemas/v1.1/images_index.rng

nova/api/openstack/schemas/v1.1/limits.rng

nova/api/openstack/schemas/v1.1/metadata.rng

nova/db/sqlalchemy/migrate_repo/versions/046_add_instance_swap.py

nova/tests/api/openstack/contrib/test_volumes.py

files removed:
nova/image/service.py

files renamed:
nova/db/sqlalchemy/migrate_repo/versions/046_add_disk_config_to_instances.py => nova/db/sqlalchemy/migrate_repo/versions/047_add_disk_config_to_instances.py

nova/tests/public_key/ => nova/tests/api/ec2/public_key/

nova/tests/test_cloud.py => nova/tests/api/ec2/test_cloud.py

files modified:
MANIFEST.in

bin/nova-manage

bin/nova-vncproxy

nova/api/auth.py

nova/api/ec2/cloud.py

nova/api/openstack/common.py

nova/api/openstack/contrib/rescue.py

nova/api/openstack/contrib/volumes.py

nova/api/openstack/create_instance_helper.py

nova/api/openstack/flavors.py

nova/api/openstack/image_metadata.py

nova/api/openstack/images.py

nova/api/openstack/ips.py

nova/api/openstack/limits.py

nova/api/openstack/schemas/v1.1/server.rng

nova/api/openstack/servers.py

nova/api/openstack/versions.py

nova/api/openstack/views/flavors.py

nova/api/openstack/views/images.py

nova/api/openstack/views/versions.py

nova/api/openstack/wsgi.py

nova/compute/api.py

nova/compute/manager.py

nova/context.py

nova/db/api.py

nova/db/sqlalchemy/api.py

nova/db/sqlalchemy/models.py

nova/exception.py

nova/flags.py

nova/image/__init__.py

nova/image/fake.py

nova/image/glance.py

nova/image/s3.py

nova/network/linux_net.py

nova/network/manager.py

nova/scheduler/abstract_scheduler.py

nova/scheduler/base_scheduler.py

nova/tests/api/openstack/common.py

nova/tests/api/openstack/contrib/test_createserverext.py

nova/tests/api/openstack/contrib/test_rescue.py

nova/tests/api/openstack/fakes.py

nova/tests/api/openstack/test_api.py

nova/tests/api/openstack/test_common.py

nova/tests/api/openstack/test_extensions.py

nova/tests/api/openstack/test_flavors.py

nova/tests/api/openstack/test_image_metadata.py

nova/tests/api/openstack/test_images.py

nova/tests/api/openstack/test_limits.py

nova/tests/api/openstack/test_server_actions.py

nova/tests/api/openstack/test_servers.py

nova/tests/api/openstack/test_versions.py

nova/tests/api/openstack/test_wsgi.py

nova/tests/db/fakes.py

nova/tests/fake_network.py

nova/tests/glance/stubs.py

nova/tests/image/test_glance.py

nova/tests/integrated/integrated_helpers.py

nova/tests/integrated/test_xml.py

nova/tests/test_api.py

nova/tests/test_compute.py

nova/tests/test_direct.py

nova/tests/test_libvirt.py

nova/tests/test_network.py

nova/tests/test_xenapi.py

nova/tests/vmwareapi/stubs.py

nova/virt/disk.py

nova/virt/images.py

nova/virt/libvirt/connection.py

nova/virt/libvirt/firewall.py

nova/virt/vmwareapi/fake.py

nova/virt/vmwareapi/vif.py

nova/virt/vmwareapi/vm_util.py

nova/virt/vmwareapi/vmops.py

nova/virt/vmwareapi/vmware_images.py

nova/virt/xenapi/vm_utils.py

nova/virt/xenapi/vmops.py

nova/volume/driver.py

plugins/xenserver/xenapi/etc/xapi.d/plugins/glance

tools/esx/guest_tool.py

tools/pip-requires

Show diffs side-by-side

added added

removed removed

bin/nova-manage

bin/nova-vncproxy

nova/api/auth.py

nova/api/ec2/cloud.py

nova/api/openstack/common.py

nova/api/openstack/contrib/flavorextradata.py

nova/api/openstack/contrib/rescue.py

nova/api/openstack/contrib/volumes.py

nova/api/openstack/create_instance_helper.py

nova/api/openstack/flavors.py

nova/api/openstack/image_metadata.py

nova/api/openstack/images.py

nova/api/openstack/ips.py

nova/api/openstack/limits.py

nova/api/openstack/schemas/v1.1/addresses.rng

nova/api/openstack/schemas/v1.1/flavor.rng

nova/api/openstack/schemas/v1.1/flavors.rng

nova/api/openstack/schemas/v1.1/flavors_index.rng

nova/api/openstack/schemas/v1.1/image.rng

nova/api/openstack/schemas/v1.1/images.rng

nova/api/openstack/schemas/v1.1/images_index.rng

nova/api/openstack/schemas/v1.1/limits.rng

nova/api/openstack/schemas/v1.1/metadata.rng

nova/api/openstack/schemas/v1.1/server.rng

nova/api/openstack/servers.py

nova/api/openstack/versions.py

nova/api/openstack/views/flavors.py

nova/api/openstack/views/images.py

nova/api/openstack/views/versions.py

nova/api/openstack/wsgi.py

nova/compute/api.py

nova/compute/manager.py

nova/context.py

nova/db/sqlalchemy/api.py

nova/db/sqlalchemy/migrate_repo/versions/046_add_instance_swap.py

nova/db/sqlalchemy/models.py

nova/exception.py

nova/image/__init__.py

nova/image/fake.py

nova/image/glance.py

nova/image/s3.py

nova/image/service.py

nova/network/linux_net.py

nova/network/manager.py

nova/scheduler/abstract_scheduler.py

nova/scheduler/base_scheduler.py

nova/tests/api/ec2/test_cloud.py

nova/tests/api/openstack/common.py

nova/tests/api/openstack/contrib/test_createserverext.py

nova/tests/api/openstack/contrib/test_rescue.py

nova/tests/api/openstack/contrib/test_volumes.py

nova/tests/api/openstack/fakes.py

nova/tests/api/openstack/test_api.py

nova/tests/api/openstack/test_common.py

nova/tests/api/openstack/test_extensions.py

nova/tests/api/openstack/test_flavors.py

nova/tests/api/openstack/test_image_metadata.py

nova/tests/api/openstack/test_images.py

nova/tests/api/openstack/test_limits.py

nova/tests/api/openstack/test_server_actions.py

nova/tests/api/openstack/test_servers.py

nova/tests/api/openstack/test_versions.py

nova/tests/api/openstack/test_wsgi.py

nova/tests/db/fakes.py

nova/tests/fake_network.py

nova/tests/glance/stubs.py

nova/tests/image/test_glance.py

nova/tests/integrated/integrated_helpers.py

nova/tests/integrated/test_xml.py

nova/tests/test_api.py

nova/tests/test_compute.py

nova/tests/test_direct.py

nova/tests/test_libvirt.py

nova/tests/test_network.py

nova/tests/test_xenapi.py

nova/tests/vmwareapi/stubs.py

nova/virt/disk.py

nova/virt/images.py

nova/virt/libvirt/connection.py

nova/virt/libvirt/firewall.py

nova/virt/vmwareapi/fake.py

nova/virt/vmwareapi/vif.py

nova/virt/vmwareapi/vm_util.py

nova/virt/vmwareapi/vmops.py

nova/virt/vmwareapi/vmware_images.py

nova/virt/xenapi/vm_utils.py

nova/virt/xenapi/vmops.py

nova/volume/driver.py

plugins/xenserver/xenapi/etc/xapi.d/plugins/glance

tools/esx/guest_tool.py

tools/pip-requires

Older »