← Back to branch summary

~raxnetworking/nova/melange

~raxnetworking/nova/melange

Viewing all changes in revision 1360.

Committer: Rajaram Mallya
Date: 2011-08-30 12:26:09 UTC
mfrom: (1265.2.243 nova)
Revision ID: rajarammallya@gmail.com-20110830122609-0guvovljx1r899hy

merge from nova trunk

files added:
bin/nova-vsa

nova/api/openstack/contrib/virtual_storage_arrays.py

nova/api/openstack/contrib/volumetypes.py

nova/db/sqlalchemy/migrate_repo/versions/042_add_volume_types_and_extradata.py

nova/db/sqlalchemy/migrate_repo/versions/043_add_vsa_data.py

nova/scheduler/vsa.py

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

nova/tests/api/openstack/test_volume_types.py

nova/tests/api/openstack/test_volume_types_extra_specs.py

nova/tests/scheduler/test_vsa_scheduler.py

nova/tests/test_test_utils.py

nova/tests/test_virt_drivers.py

nova/tests/test_volume_types.py

nova/tests/test_volume_types_extra_specs.py

nova/tests/test_vsa.py

nova/tests/test_vsa_volumes.py

nova/tests/utils.py

nova/volume/volume_types.py

nova/vsa

nova/vsa/__init__.py

nova/vsa/api.py

nova/vsa/connection.py

nova/vsa/fake.py

nova/vsa/manager.py

nova/vsa/utils.py

files modified:
Authors

bin/nova-manage

nova/api/ec2/__init__.py

nova/api/openstack/contrib/volumes.py

nova/compute/api.py

nova/compute/manager.py

nova/db/api.py

nova/db/sqlalchemy/api.py

nova/db/sqlalchemy/migrate_repo/versions/016_make_quotas_key_and_value.py

nova/db/sqlalchemy/migrate_repo/versions/036_change_flavor_id_in_migrations.py

nova/db/sqlalchemy/migration.py

nova/db/sqlalchemy/models.py

nova/exception.py

nova/flags.py

nova/ipv6/account_identifier.py

nova/log.py

nova/network/manager.py

nova/quota.py

nova/scheduler/abstract_scheduler.py

nova/test.py

nova/tests/api/openstack/test_extensions.py

nova/tests/integrated/test_servers.py

nova/tests/integrated/test_volumes.py

nova/tests/test_instance_types.py

nova/tests/test_ipv6.py

nova/tests/xenapi/stubs.py

nova/virt/driver.py

nova/virt/fake.py

nova/virt/libvirt.xml.template

nova/virt/libvirt/connection.py

nova/virt/xenapi/fake.py

nova/virt/xenapi/vmops.py

nova/volume/api.py

nova/volume/driver.py

nova/volume/manager.py

run_tests.sh

Show diffs side-by-side

added added

removed removed

bin/nova-manage

nova/api/ec2/__init__.py

nova/api/openstack/contrib/virtual_storage_arrays.py

nova/api/openstack/contrib/volumes.py

nova/api/openstack/contrib/volumetypes.py

nova/compute/api.py

nova/compute/manager.py

nova/db/sqlalchemy/api.py

nova/db/sqlalchemy/migrate_repo/versions/016_make_quotas_key_and_value.py

nova/db/sqlalchemy/migrate_repo/versions/036_change_flavor_id_in_migrations.py

nova/db/sqlalchemy/migrate_repo/versions/042_add_volume_types_and_extradata.py

nova/db/sqlalchemy/migrate_repo/versions/043_add_vsa_data.py

nova/db/sqlalchemy/migration.py

nova/db/sqlalchemy/models.py

nova/exception.py

nova/ipv6/account_identifier.py

nova/network/manager.py

nova/scheduler/abstract_scheduler.py

nova/scheduler/vsa.py

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

nova/tests/api/openstack/test_extensions.py

nova/tests/api/openstack/test_volume_types.py

nova/tests/api/openstack/test_volume_types_extra_specs.py

nova/tests/integrated/test_servers.py

nova/tests/integrated/test_volumes.py

nova/tests/scheduler/test_vsa_scheduler.py

nova/tests/test_instance_types.py

nova/tests/test_ipv6.py

nova/tests/test_test_utils.py

nova/tests/test_virt_drivers.py

nova/tests/test_volume_types.py

nova/tests/test_volume_types_extra_specs.py

nova/tests/test_vsa.py

nova/tests/test_vsa_volumes.py

nova/tests/utils.py

nova/tests/xenapi/stubs.py

nova/virt/driver.py

nova/virt/fake.py

nova/virt/libvirt.xml.template

nova/virt/libvirt/connection.py

nova/virt/xenapi/fake.py

nova/virt/xenapi/vmops.py

nova/volume/api.py

nova/volume/driver.py

nova/volume/manager.py

nova/volume/volume_types.py

nova/vsa/__init__.py

nova/vsa/api.py

nova/vsa/connection.py

nova/vsa/fake.py

nova/vsa/manager.py

nova/vsa/utils.py

Older »