← Back to branch summary

~rackspace-titan/nova/instance_states

~rackspace-titan/nova/instance_states

Viewing all changes in revision 1492.

Committer: Brian Lamar
Date: 2011-08-25 20:38:57 UTC
mfrom: (1443.2.52 nova)
Revision ID: brian.lamar@rackspace.com-20110825203857-0emj77wsmoe7zpq1

Merged trunk.

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

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

nova/tests/api/openstack/test_volume_types.py

nova/tests/api/openstack/test_volume_types_extra_specs.py

nova/tests/test_volume_types.py

nova/tests/test_volume_types_extra_specs.py

nova/volume/volume_types.py

files modified:
nova/api/openstack/contrib/volumes.py

nova/db/api.py

nova/db/sqlalchemy/api.py

nova/db/sqlalchemy/migration.py

nova/db/sqlalchemy/models.py

nova/exception.py

nova/tests/api/openstack/test_extensions.py

nova/tests/integrated/test_volumes.py

nova/tests/test_instance_types.py

nova/virt/xenapi/vmops.py

nova/volume/api.py

Show diffs side-by-side

added added

removed removed

nova/api/openstack/contrib/volumes.py

nova/api/openstack/contrib/volumetypes.py

nova/db/sqlalchemy/api.py

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

nova/db/sqlalchemy/migration.py

nova/db/sqlalchemy/models.py

nova/exception.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_volumes.py

nova/tests/test_instance_types.py

nova/tests/test_volume_types.py

nova/tests/test_volume_types_extra_specs.py

nova/virt/xenapi/vmops.py

nova/volume/api.py

nova/volume/volume_types.py

Older »