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

Proposed by Thierry Carrez
Status: Merged
Approved by: John Dickinson
Approved revision: 304
Merged at revision: 304
Proposed branch: lp://qastaging/~ttx/swift/1.4.1-proposed
Merge into: lp://qastaging/~hudson-openstack/swift/milestone-proposed
Diff against target: 11368 lines (+2932/-7158)
46 files modified
CHANGELOG (+16/-0)
bin/st (+0/-1812)
bin/swauth-add-account (+0/-68)
bin/swauth-add-user (+0/-93)
bin/swauth-cleanup-tokens (+0/-118)
bin/swauth-delete-account (+0/-60)
bin/swauth-delete-user (+0/-60)
bin/swauth-list (+0/-86)
bin/swauth-prep (+0/-59)
bin/swauth-set-account-service (+0/-73)
bin/swift (+1812/-0)
doc/source/admin_guide.rst (+0/-16)
doc/source/deployment_guide.rst (+37/-28)
doc/source/development_auth.rst (+7/-7)
doc/source/development_saio.rst (+12/-20)
doc/source/howto_installmultinode.rst (+39/-80)
doc/source/misc.rst (+6/-6)
doc/source/overview_auth.rst (+8/-151)
doc/source/overview_large_objects.rst (+12/-12)
doc/source/overview_stats.rst (+6/-5)
etc/log-processor.conf-sample (+1/-0)
etc/proxy-server.conf-sample (+27/-17)
setup.py (+2/-6)
swift/__init__.py (+1/-1)
swift/account/server.py (+3/-3)
swift/common/bench.py (+4/-3)
swift/common/daemon.py (+2/-1)
swift/common/db.py (+38/-15)
swift/common/db_replicator.py (+32/-3)
swift/common/middleware/staticweb.py (+8/-8)
swift/common/middleware/swauth.py (+0/-1374)
swift/common/middleware/tempauth.py (+482/-0)
swift/common/utils.py (+1/-1)
swift/container/server.py (+2/-2)
swift/proxy/server.py (+64/-15)
swift/stats/db_stats_collector.py (+32/-7)
swift/stats/log_uploader.py (+1/-1)
test/functional/tests.py (+4/-4)
test/probe/common.py (+19/-21)
test/unit/account/test_server.py (+3/-0)
test/unit/common/middleware/test_staticweb.py (+6/-6)
test/unit/common/middleware/test_tempauth.py (+72/-2905)
test/unit/common/test_utils.py (+4/-0)
test/unit/container/test_server.py (+3/-0)
test/unit/proxy/test_server.py (+75/-3)
test/unit/stats/test_db_stats_collector.py (+91/-8)
To merge this branch: bzr merge lp://qastaging/~ttx/swift/1.4.1-proposed
Reviewer Review Type Date Requested Status
Swift Core security contacts Pending
Review via email: mp+64648@code.qastaging.launchpad.net

Commit message

Merge 1.4.1 development from trunk (rev312)

Description of the change

Merge 1.4.1 development from trunk into milestone-proposed branch.

This was taken from rev312 in trunk (the last revision before 1.4.2 versioning)

To post a comment you must log in.

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