← Back to branch summary

~gholt/swift/timeout_baseexception

~gholt/swift/timeout_baseexception

Viewing all changes in revision 219.1.9.

Committer: gholt
Date: 2011-03-11 19:38:02 UTC
mfrom: (240 swift)
mto: This revision was merged to the branch mainline in revision 250.
Revision ID: gholt@rackspace.com-20110311193802-aqffry3y4rcjz4u1

Merged from trunk

files added:
doc/source/images

doc/source/images/howto_cyberduck_config.png

files removed:
doc/source/howto_cyberduck_config.png

files modified:
doc/source/_static/tweaks.css

doc/source/_theme/layout.html

doc/source/conf.py

doc/source/howto_cyberduck.rst

swift/account/server.py

swift/container/server.py

swift/obj/server.py

swift/proxy/server.py

test/unit/proxy/test_server.py

Show diffs side-by-side

added added

removed removed

doc/source/_static/tweaks.css

doc/source/_theme/layout.html

doc/source/conf.py

doc/source/howto_cyberduck.rst

doc/source/howto_cyberduck_config.png

doc/source/images/

doc/source/images/howto_cyberduck_config.png

swift/account/server.py

swift/container/server.py

swift/obj/server.py

swift/proxy/server.py

test/unit/proxy/test_server.py

Older »