← Back to branch summary

~blamar/nova/lp728587

~blamar/nova/lp728587

Viewing all changes in revision 136.

Committer: Joshua McKenty
Date: 2010-07-15 05:11:48 UTC
mfrom: (7.4.4)
Revision ID: git-v1:b3fb3d56103370af5b63a1d382e022ac7846ecf2

Merge branch 'master' of github.com:angst/cc

files added:
bin/nova-import-canonical-imagestore

bin/nova-rsapi

exercise_rsapi.py

nova/endpoint/rackspace.py

nova/endpoint/wsgi.py

files modified:
nova/endpoint/cloud.py

nova/objectstore/handler.py

nova/objectstore/image.py

nova/tests/objectstore_unittest.py

Show diffs side-by-side

added added

removed removed

bin/nova-import-canonical-imagestore

exercise_rsapi.py

nova/endpoint/cloud.py

nova/endpoint/rackspace.py

nova/endpoint/wsgi.py

nova/objectstore/handler.py

nova/objectstore/image.py

nova/tests/objectstore_unittest.py

Older »