Merge lp://qastaging/~ttx/swift/1.4.2-merge into lp://qastaging/~hudson-openstack/swift/milestone-proposed

Proposed by Thierry Carrez
Status: Merged
Approved by: Thierry Carrez
Approved revision: 306
Merged at revision: 306
Proposed branch: lp://qastaging/~ttx/swift/1.4.2-merge
Merge into: lp://qastaging/~hudson-openstack/swift/milestone-proposed
Diff against target: 8678 lines (+2984/-4028)
66 files modified
AUTHORS (+1/-0)
CHANGELOG (+21/-0)
bin/swift (+87/-32)
bin/swift-account-stats-logger (+0/-27)
bin/swift-container-stats-logger (+0/-27)
bin/swift-container-sync (+23/-0)
bin/swift-log-stats-collector (+0/-35)
bin/swift-log-uploader (+0/-49)
doc/source/container.rst (+7/-0)
doc/source/deployment_guide.rst (+10/-0)
doc/source/development_saio.rst (+8/-1)
doc/source/index.rst (+1/-1)
doc/source/overview_auth.rst (+11/-5)
doc/source/overview_container_sync.rst (+228/-0)
doc/source/overview_large_objects.rst (+9/-2)
doc/source/overview_stats.rst (+0/-192)
doc/source/ratelimit.rst (+5/-8)
etc/account-server.conf-sample (+0/-11)
etc/container-server.conf-sample (+15/-0)
etc/log-processor.conf-sample (+0/-57)
etc/proxy-server.conf-sample (+8/-0)
setup.py (+1/-5)
swift/__init__.py (+1/-1)
swift/common/client.py (+68/-27)
swift/common/compressing_file_reader.py (+0/-73)
swift/common/db.py (+74/-23)
swift/common/direct_client.py (+51/-0)
swift/common/internal_proxy.py (+0/-210)
swift/common/manager.py (+4/-3)
swift/common/middleware/domain_remap.py (+4/-0)
swift/common/middleware/ratelimit.py (+6/-7)
swift/common/middleware/swift3.py (+13/-3)
swift/common/middleware/tempauth.py (+15/-2)
swift/common/utils.py (+28/-2)
swift/container/server.py (+30/-4)
swift/container/sync.py (+424/-0)
swift/obj/server.py (+28/-15)
swift/proxy/server.py (+156/-64)
swift/stats/access_processor.py (+0/-250)
swift/stats/db_stats_collector.py (+0/-177)
swift/stats/log_processor.py (+0/-581)
swift/stats/log_uploader.py (+0/-188)
swift/stats/stats_processor.py (+0/-69)
test/functional/swift.py (+1/-1)
test/functional/tests.py (+2/-2)
test/probe/common.py (+2/-2)
test/probe/test_account_failures.py (+5/-3)
test/probe/test_container_failures.py (+15/-8)
test/probe/test_object_handoff.py (+43/-41)
test/unit/common/middleware/test_ratelimit.py (+114/-104)
test/unit/common/middleware/test_swift3.py (+9/-0)
test/unit/common/middleware/test_tempauth.py (+183/-7)
test/unit/common/test_client.py (+3/-3)
test/unit/common/test_compressing_file_reader.py (+0/-34)
test/unit/common/test_db.py (+92/-0)
test/unit/common/test_internal_proxy.py (+0/-192)
test/unit/common/test_utils.py (+20/-0)
test/unit/container/test_server.py (+70/-0)
test/unit/container/test_sync.py (+824/-0)
test/unit/obj/test_replicator.py (+1/-1)
test/unit/proxy/test_server.py (+263/-44)
test/unit/stats/test_access_processor.py (+0/-94)
test/unit/stats/test_db_stats_collector.py (+0/-238)
test/unit/stats/test_log_processor.py (+0/-834)
test/unit/stats/test_log_uploader.py (+0/-240)
test/unit/stats/test_stats_processor.py (+0/-29)
To merge this branch: bzr merge lp://qastaging/~ttx/swift/1.4.2-merge
Reviewer Review Type Date Requested Status
Thierry Carrez Approve
Review via email: mp+69224@code.qastaging.launchpad.net

Commit message

Merge 1.4.2 development from trunk (rev331)

Description of the change

Merge 1.4.2 development from trunk (rev331)

Check using 'bzr diff --old lp:swift --new lp:~ttx/swift/1.4.2-merge'

To post a comment you must log in.
Revision history for this message
Thierry Carrez (ttx) wrote :

Doublechecked (this should really be automated :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches