Merge lp://qastaging/~ttx/glance/d3-merge into lp://qastaging/~hudson-openstack/glance/milestone-proposed
Proposed by
Thierry Carrez
Status: | Merged |
---|---|
Approved by: | Thierry Carrez |
Approved revision: | 143 |
Merged at revision: | 143 |
Proposed branch: | lp://qastaging/~ttx/glance/d3-merge |
Merge into: | lp://qastaging/~hudson-openstack/glance/milestone-proposed |
Diff against target: |
7532 lines (+4952/-565) 63 files modified
Authors (+3/-0) bin/glance (+374/-60) bin/glance-cache-prefetcher (+65/-0) bin/glance-cache-pruner (+65/-0) bin/glance-cache-reaper (+73/-0) bin/glance-control (+4/-3) bin/glance-scrubber (+80/-0) etc/glance-api.conf (+25/-1) etc/glance-prefetcher.conf (+21/-0) etc/glance-pruner.conf (+28/-0) etc/glance-reaper.conf (+29/-0) etc/glance-registry.conf (+7/-1) etc/glance-scrubber.conf (+36/-0) glance/api/__init__.py (+47/-0) glance/api/cached_images.py (+105/-0) glance/api/middleware/image_cache.py (+57/-0) glance/api/middleware/version_negotiation.py (+1/-1) glance/api/v1/__init__.py (+1/-1) glance/api/v1/images.py (+118/-50) glance/client.py (+119/-5) glance/common/client.py (+5/-1) glance/common/context.py (+97/-0) glance/common/exception.py (+18/-0) glance/image_cache/__init__.py (+451/-0) glance/image_cache/prefetcher.py (+90/-0) glance/image_cache/pruner.py (+115/-0) glance/image_cache/reaper.py (+45/-0) glance/registry/__init__.py (+17/-16) glance/registry/client.py (+3/-3) glance/registry/db/api.py (+71/-24) glance/registry/db/migrate_repo/schema.py (+2/-2) glance/registry/db/migrate_repo/versions/007_add_owner.py (+82/-0) glance/registry/db/migration.py (+12/-6) glance/registry/db/models.py (+10/-0) glance/registry/server.py (+87/-21) glance/store/__init__.py (+39/-55) glance/store/filesystem.py (+50/-12) glance/store/http.py (+80/-7) glance/store/location.py (+182/-0) glance/store/s3.py (+119/-29) glance/store/scrubber.py (+90/-0) glance/store/swift.py (+145/-86) glance/utils.py (+161/-0) run_tests.py (+8/-4) setup.py (+3/-0) tests/functional/__init__.py (+62/-9) tests/functional/test_bin_glance.py (+0/-4) tests/functional/test_curl_api.py (+3/-6) tests/functional/test_httplib2_api.py (+806/-2) tests/functional/test_logging.py (+0/-2) tests/functional/test_misc.py (+0/-1) tests/functional/test_scrubber.py (+111/-0) tests/stubs.py (+35/-19) tests/unit/test_api.py (+162/-49) tests/unit/test_clients.py (+32/-11) tests/unit/test_config.py (+1/-1) tests/unit/test_context.py (+148/-0) tests/unit/test_filesystem_store.py (+12/-13) tests/unit/test_store_location.py (+243/-0) tests/unit/test_stores.py (+0/-1) tests/unit/test_swift_store.py (+94/-58) tools/install_venv.py (+2/-1) tools/pip-requires (+1/-0) |
To merge this branch: | bzr merge lp://qastaging/~ttx/glance/d3-merge |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Thierry Carrez | Approve | ||
Review via email:
|
Commit message
Merge diablo-3 development from trunk (rev160)
Description of the change
Merge diablo-3 development from trunk (rev160)
This really should be automated.
Check using 'bzr diff --old lp:glance --new lp:~ttx/glance/d3-merge'
To post a comment you must log in.
Verified identical to lp:glance