← Back to branch summary

~citrix-openstack/nova/xenapi

~citrix-openstack/nova/xenapi

Viewing all changes in revision 432.

Committer: Armando Migliaccio
Date: 2010-12-08 18:54:15 UTC
mfrom: (408.9.27 nova)
Revision ID: armando.migliaccio@citrix.com-20101208185415-6zzxqegs1qx9troh

merge trunk

files removed:
nova/api/cloud.py

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

nova/api/openstack/servers.py

nova/auth/manager.py

nova/compute/api.py

nova/db/sqlalchemy/api.py

nova/flags.py

nova/tests/api/openstack/fakes.py

nova/tests/api/openstack/test_servers.py

nova/tests/compute_unittest.py

Show diffs side-by-side

added added

removed removed

nova/api/cloud.py

nova/api/ec2/cloud.py

nova/api/openstack/servers.py

nova/auth/manager.py

nova/compute/api.py

nova/db/sqlalchemy/api.py

nova/tests/api/openstack/fakes.py

nova/tests/api/openstack/test_servers.py

nova/tests/compute_unittest.py

Older »