Merge lp://staging/~zulcss/glance/glance-cloud-g2 into lp://staging/~ubuntu-cloud-archive/ubuntu/precise/glance/trunk
Proposed by
Chuck Short
Status: | Merged |
---|---|
Approved by: | Adam Gandelman |
Approved revision: | 65 |
Merged at revision: | 65 |
Proposed branch: | lp://staging/~zulcss/glance/glance-cloud-g2 |
Merge into: | lp://staging/~ubuntu-cloud-archive/ubuntu/precise/glance/trunk |
Diff against target: |
8652 lines (+3931/-1759) 97 files modified
AUTHORS (+6/-0) ChangeLog (+914/-0) bin/glance-api (+1/-1) bin/glance-cache-manage (+2/-2) bin/glance-control (+56/-55) bin/glance-manage (+51/-45) bin/glance-registry (+1/-1) debian/changelog (+31/-0) debian/control (+50/-57) debian/copyright (+0/-1) debian/glance-api.glance-api.upstart (+4/-2) debian/glance-api.install (+7/-7) debian/glance-api.manpages (+6/-0) debian/glance-common.install (+1/-1) debian/glance-common.manpages (+2/-0) debian/glance-registry.glance-registry.upstart (+4/-2) debian/glance-registry.install (+2/-2) debian/glance-registry.manpages (+1/-0) debian/python-glance.install (+0/-1) debian/rules (+3/-1) doc/source/authentication.rst (+1/-1) doc/source/configuring.rst (+12/-4) doc/source/formats.rst (+1/-1) etc/glance-api-paste.ini (+1/-1) etc/glance-api.conf (+7/-2) etc/glance-registry-paste.ini (+1/-1) glance.egg-info/SOURCES.txt (+4/-1) glance.egg-info/requires.txt (+3/-2) glance/api/authorization.py (+145/-0) glance/api/middleware/cache.py (+7/-1) glance/api/middleware/version_negotiation.py (+1/-1) glance/api/policy.py (+67/-0) glance/api/v1/controller.py (+3/-3) glance/api/v1/images.py (+24/-20) glance/api/v1/members.py (+1/-1) glance/api/v2/image_data.py (+11/-6) glance/api/v2/image_tags.py (+1/-1) glance/api/v2/images.py (+128/-289) glance/common/client.py (+3/-0) glance/common/config.py (+17/-9) glance/common/utils.py (+38/-0) glance/common/wsgi.py (+10/-5) glance/db/__init__.py (+1/-1) glance/db/simple/api.py (+14/-6) glance/db/sqlalchemy/api.py (+72/-33) glance/gateway.py (+50/-0) glance/image_cache/__init__.py (+1/-1) glance/image_cache/client.py (+1/-1) glance/image_cache/drivers/sqlite.py (+2/-2) glance/notifier/__init__.py (+52/-0) glance/notifier/notify_kombu.py (+1/-1) glance/notifier/notify_qpid.py (+1/-1) glance/openstack/common/cfg.py (+309/-175) glance/registry/__init__.py (+2/-0) glance/registry/api/v1/images.py (+1/-1) glance/registry/api/v1/members.py (+1/-1) glance/store/__init__.py (+50/-11) glance/store/base.py (+1/-1) glance/store/filesystem.py (+29/-12) glance/store/http.py (+1/-1) glance/store/s3.py (+6/-6) glance/store/scrubber.py (+1/-1) glance/store/swift.py (+239/-314) glance/tests/functional/__init__.py (+9/-9) glance/tests/functional/store/__init__.py (+14/-2) glance/tests/functional/store/test_filesystem.py (+1/-0) glance/tests/functional/store/test_http.py (+7/-0) glance/tests/functional/store/test_s3.py (+139/-0) glance/tests/functional/store/test_swift.py (+5/-4) glance/tests/functional/test_bin_glance_control.py (+3/-1) glance/tests/functional/test_client_exceptions.py (+1/-1) glance/tests/functional/test_client_redirects.py (+2/-2) glance/tests/functional/test_glance_manage.py (+1/-1) glance/tests/functional/test_scrubber.py (+2/-2) glance/tests/functional/v1/test_api.py (+19/-0) glance/tests/functional/v1/test_s3.py (+0/-323) glance/tests/functional/v1/test_ssl.py (+0/-3) glance/tests/functional/v2/test_images.py (+37/-4) glance/tests/unit/api/test_common.py (+1/-1) glance/tests/unit/test_auth.py (+222/-0) glance/tests/unit/test_cache_middleware.py (+70/-0) glance/tests/unit/test_db.py (+1/-1) glance/tests/unit/test_domain.py (+1/-1) glance/tests/unit/test_migrations.py (+1/-1) glance/tests/unit/test_notifier.py (+60/-1) glance/tests/unit/test_policy.py (+154/-1) glance/tests/unit/test_store_image.py (+82/-0) glance/tests/unit/test_store_location.py (+4/-4) glance/tests/unit/test_swift_store.py (+252/-8) glance/tests/unit/test_utils.py (+11/-0) glance/tests/unit/v1/test_api.py (+44/-16) glance/tests/unit/v2/test_image_data_resource.py (+5/-4) glance/tests/unit/v2/test_images_resource.py (+308/-266) glance/versioninfo (+1/-1) run_tests.sh (+9/-2) tools/pip-requires (+2/-1) tools/test-requires (+0/-3) |
To merge this branch: | bzr merge lp://staging/~zulcss/glance/glance-cloud-g2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Adam Gandelman (community) | Needs Fixing | ||
Review via email: mp+144556@code.staging.launchpad.net |
To post a comment you must log in.
Please maintain the 0ubuntuX verisoning (2013.1~ g2-0ubuntu1~ cloud0)