lp:~gholt/swift/consync

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~hudson-openstack/swift/trunk at revision 326

David Goetz (community): Approve on 2011-07-18

John Dickinson: Approve on 2011-07-18

Diff: 3215 lines (+2298/-142)

28 files modified

bin/swift (+87/-32)
bin/swift-container-sync (+23/-0)
doc/source/container.rst (+7/-0)
doc/source/development_saio.rst (+8/-0)
doc/source/index.rst (+1/-0)
doc/source/overview_auth.rst (+11/-5)
doc/source/overview_container_sync.rst (+228/-0)
doc/source/overview_large_objects.rst (+9/-2)
etc/container-server.conf-sample (+15/-0)
etc/proxy-server.conf-sample (+3/-0)
setup.py (+1/-1)
swift/common/client.py (+68/-27)
swift/common/db.py (+74/-23)
swift/common/manager.py (+4/-3)
swift/common/middleware/domain_remap.py (+4/-0)
swift/common/middleware/tempauth.py (+14/-1)
swift/common/utils.py (+26/-0)
swift/container/server.py (+31/-4)
swift/container/sync.py (+424/-0)
swift/obj/server.py (+20/-11)
swift/proxy/server.py (+64/-21)
test/probe/common.py (+2/-2)
test/unit/common/middleware/test_tempauth.py (+165/-7)
test/unit/common/test_client.py (+3/-3)
test/unit/common/test_db.py (+92/-0)
test/unit/common/test_utils.py (+20/-0)
test/unit/container/test_server.py (+70/-0)
test/unit/container/test_sync.py (+824/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

273. By gholt on 2011-07-14

Ensure paired alter table commands are in same transaction

272. By gholt on 2011-07-14

Reset container sync points when the sync-to changes

271. By gholt on 2011-07-14

Added notes about container sync and large objects

270. By gholt on 2011-07-14

Merged from trunk

269. By gholt on 2011-07-10

comment on domain_remap regarding container sync

268. By gholt on 2011-07-08

consync: fixes as per the code roast

267. By gholt on 2011-07-07

Updated swift util with client.py changes.

266. By gholt on 2011-07-05

consync: updated client.py to better work with proxies. Had to use the private httplib._set_tunnel though. :/

265. By gholt on 2011-06-30

Merged from trunk

264. By gholt on 2011-06-29

consync: updated class docs