← Back to branch summary

~gundlach/nova/servers_api

~gundlach/nova/servers_api

Viewing all changes in revision 296.

Committer: Cerberus
Date: 2010-09-29 02:11:29 UTC
mfrom: (295.1.3 trunk)
Revision ID: matt.dietz@rackspace.com-20100929021129-v0wxf5yxcb12dllo

Merge from trunk

files modified:
bin/nova-manage

nova/api/ec2/cloud.py

nova/compute/manager.py

nova/db/api.py

nova/db/sqlalchemy/api.py

nova/db/sqlalchemy/models.py

nova/network/linux_net.py

nova/network/manager.py

nova/tests/rpc_unittest.py

nova/volume/manager.py

Show diffs side-by-side

added added

removed removed

bin/nova-manage

nova/api/ec2/cloud.py

nova/compute/manager.py

nova/db/sqlalchemy/api.py

nova/db/sqlalchemy/models.py

nova/network/linux_net.py

nova/network/manager.py

nova/tests/rpc_unittest.py

nova/volume/manager.py

Older »