← Back to branch summary

~rackspace-titan/nova/instance_states

~rackspace-titan/nova/instance_states

Viewing all changes in revision 1496.

Committer: Brian Lamar
Date: 2011-08-26 18:43:27 UTC
mfrom: (1443.2.57 nova)
Revision ID: brian.lamar@rackspace.com-20110826184327-isqh61bp35kpzg1b

Merged trunk and fixed conflicts.

files added:
nova/tests/test_test_utils.py

nova/tests/test_virt_drivers.py

nova/tests/utils.py

files modified:
Authors

nova/compute/api.py

nova/compute/manager.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/log.py

nova/tests/integrated/test_servers.py

nova/virt/driver.py

nova/virt/fake.py

nova/volume/driver.py

Show diffs side-by-side

added added

removed removed

nova/compute/api.py

nova/compute/manager.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/tests/integrated/test_servers.py

nova/tests/test_test_utils.py

nova/tests/test_virt_drivers.py

nova/tests/utils.py

nova/virt/driver.py

nova/virt/fake.py

nova/volume/driver.py

Older »