← Back to branch summary

~johannes.erdfelt/glance/notifier

~johannes.erdfelt/glance/notifier

Viewing all changes in revision 171.

Committer: Johannes Erdfelt
Date: 2011-08-03 14:12:59 UTC
mfrom: (157.1.23 glance)
Revision ID: johannes.erdfelt@rackspace.com-20110803141259-b5ufp3uiyzazcqhw

Merge with trunk

files added:
glance/store/base.py

glance/tests/functional/test_s3.conf

glance/tests/functional/test_s3.py

glance/tests/unit/test_s3_store.py

files removed:
tests/functional/test_curl_api.py

files renamed:
tests/ => glance/tests/

tests/functional/test_httplib2_api.py => glance/tests/functional/test_api.py

tests/unit/test_stores.py => glance/tests/unit/test_http_store.py

files modified:
MANIFEST.in

bin/glance

bin/glance-control

bin/glance-upload

doc/source/configuring.rst

doc/source/glance.rst

etc/glance-api.conf

glance/api/cached_images.py

glance/api/v1/images.py

glance/common/exception.py

glance/image_cache/__init__.py

glance/registry/db/api.py

glance/store/__init__.py

glance/store/filesystem.py

glance/store/http.py

glance/store/location.py

glance/store/s3.py

glance/store/scrubber.py

glance/store/swift.py

glance/tests/functional/__init__.py

glance/tests/functional/test_bin_glance.py

glance/tests/functional/test_logging.py

glance/tests/functional/test_misc.py

glance/tests/functional/test_scrubber.py

glance/tests/stubs.py

glance/tests/unit/test_api.py

glance/tests/unit/test_clients.py

glance/tests/unit/test_filesystem_store.py

glance/tests/unit/test_migrations.py

glance/tests/unit/test_store_location.py

glance/tests/unit/test_swift_store.py

run_tests.sh

setup.py

tools/pip-requires

Show diffs side-by-side

added added

removed removed

bin/glance-control

bin/glance-upload

doc/source/configuring.rst

doc/source/glance.rst

etc/glance-api.conf

glance/api/cached_images.py

glance/api/v1/images.py

glance/common/exception.py

glance/image_cache/__init__.py

glance/registry/db/api.py

glance/store/__init__.py

glance/store/base.py

glance/store/filesystem.py

glance/store/http.py

glance/store/location.py

glance/store/s3.py

glance/store/scrubber.py

glance/store/swift.py

glance/tests/functional/__init__.py

glance/tests/functional/test_api.py

glance/tests/functional/test_bin_glance.py

glance/tests/functional/test_logging.py

glance/tests/functional/test_misc.py

glance/tests/functional/test_s3.conf

glance/tests/functional/test_s3.py

glance/tests/functional/test_scrubber.py

glance/tests/stubs.py

glance/tests/unit/test_api.py

glance/tests/unit/test_clients.py

glance/tests/unit/test_filesystem_store.py

glance/tests/unit/test_http_store.py

glance/tests/unit/test_migrations.py

glance/tests/unit/test_s3_store.py

glance/tests/unit/test_store_location.py

glance/tests/unit/test_swift_store.py

tests/functional/test_curl_api.py

tools/pip-requires

Older »