← Back to branch summary

~jaypipes/glance/bug713154

~jaypipes/glance/bug713154

Viewing all changes in revision 136.

Committer: jaypipes at gmail
Date: 2011-06-22 17:14:00 UTC
mfrom: (124.9.7 glance)
Revision ID: jaypipes@gmail.com-20110622171400-j9uh1qvk2virzop7

Merge trunk and resolve conflict in pip-requires

files added:
tests/unit/test_wsgi.py

files modified:
glance/api/v1/__init__.py

glance/api/v1/images.py

glance/common/exception.py

glance/common/wsgi.py

glance/registry/client.py

glance/registry/server.py

glance/utils.py

tests/functional/test_curl_api.py

tests/unit/test_api.py

tools/pip-requires

Show diffs side-by-side

added added

removed removed

glance/api/v1/__init__.py

glance/api/v1/images.py

glance/common/exception.py

glance/common/wsgi.py

glance/registry/client.py

glance/registry/server.py

glance/utils.py

tests/functional/test_curl_api.py

tests/unit/test_api.py

tests/unit/test_wsgi.py

tools/pip-requires

Older »