← Back to branch summary

~jaypipes/nova/glance-image-service

~jaypipes/nova/glance-image-service

Viewing all changes in revision 324.

Committer: jaypipes at gmail
Date: 2010-10-05 20:14:21 UTC
mfrom: (316.1.12 trunk)
Revision ID: jaypipes@gmail.com-20101005201421-e3vzik3i8qjzuvlq

Merge cerberus and trunk

files modified:
nova/api/cloud.py

nova/api/rackspace/servers.py

nova/db/sqlalchemy/api.py

nova/tests/api/rackspace/test_servers.py

Show diffs side-by-side

added added

removed removed

nova/api/cloud.py

nova/api/rackspace/servers.py

nova/db/sqlalchemy/api.py

nova/tests/api/rackspace/test_servers.py

Older »