← Back to branch summary

~sandy-walsh/nova/api-parity

~sandy-walsh/nova/api-parity

Viewing all changes in revision 531.

Committer: Sandy Walsh
Date: 2011-01-07 03:04:21 UTC
mfrom: (515.3.10 nova)
Revision ID: sandy.walsh@rackspace.com-20110107030421-i5g5oerjwycw87mt

another merge with trunk to remedy instance_id issues

files modified:
nova/api/openstack/servers.py

nova/compute/api.py

nova/compute/manager.py

nova/db/sqlalchemy/api.py

nova/db/sqlalchemy/models.py

nova/tests/test_compute.py

Show diffs side-by-side

added added

removed removed

nova/api/openstack/servers.py

nova/compute/api.py

nova/compute/manager.py

nova/db/sqlalchemy/api.py

nova/db/sqlalchemy/models.py

nova/tests/test_compute.py

Older »