← Back to branch summary

~rlane/nova/lp773690

~rlane/nova/lp773690

Viewing all changes in revision 393.

Committer: rlane at wikimedia
Date: 2011-01-10 14:40:37 UTC
mfrom: (382.1.145 nova)
Revision ID: rlane@wikimedia.org-20110110144037-ephi91lem6swodv2

Merge from trunk

files modified:
nova/api/ec2/cloud.py

nova/api/openstack/servers.py

nova/compute/api.py

nova/compute/manager.py

nova/db/sqlalchemy/__init__.py

nova/db/sqlalchemy/api.py

nova/db/sqlalchemy/models.py

nova/rpc.py

nova/service.py

nova/tests/test_cloud.py

nova/tests/test_compute.py

Show diffs side-by-side

added added

removed removed

nova/api/ec2/cloud.py

nova/api/openstack/servers.py

nova/compute/api.py

nova/compute/manager.py

nova/db/sqlalchemy/__init__.py

nova/db/sqlalchemy/api.py

nova/db/sqlalchemy/models.py

nova/service.py

nova/tests/test_cloud.py

nova/tests/test_compute.py

Older »