← Back to branch summary

~markwash/nova/lp727225

~markwash/nova/lp727225

Viewing all changes in revision 779.

Committer: Mark Washenberger
Date: 2011-03-09 21:51:05 UTC
mfrom: (749.1.26 nova)
Revision ID: mark.washenberger@rackspace.com-20110309215105-hwtr2djh48p0mmp4

merge lp:nova, fix conflicts, fix tests

files modified:
bin/nova-manage

nova/api/openstack/servers.py

nova/compute/api.py

nova/db/api.py

nova/db/sqlalchemy/api.py

nova/network/manager.py

nova/tests/api/openstack/test_servers.py

Show diffs side-by-side

added added

removed removed

bin/nova-manage

nova/api/openstack/servers.py

nova/compute/api.py

nova/db/sqlalchemy/api.py

nova/network/manager.py

nova/tests/api/openstack/test_servers.py

Older »