← Back to branch summary

~greglange/swift/lp725215

~greglange/swift/lp725215

Viewing all changes in revision 255.

Committer: Greg Lange
Date: 2011-03-31 19:52:28 UTC
mfrom: (250.2.11 swift)
Revision ID: greglange@gmail.com-20110331195228-vohsps73ihftha82

fixed merge conflict

files added:
swift/common/middleware/staticweb.py

test/probe/test_object_failures.py

test/unit/common/middleware/test_staticweb.py

files modified:
bin/swauth-add-account

bin/swauth-add-user

bin/swauth-cleanup-tokens

bin/swauth-delete-account

bin/swauth-delete-user

bin/swauth-list

bin/swauth-prep

bin/swauth-set-account-service

bin/swift-account-audit

bin/swift-account-auditor

bin/swift-account-reaper

bin/swift-account-replicator

bin/swift-account-server

bin/swift-account-stats-logger

bin/swift-bench

bin/swift-container-auditor

bin/swift-container-replicator

bin/swift-container-server

bin/swift-container-updater

bin/swift-drive-audit

bin/swift-get-nodes

bin/swift-init

bin/swift-log-stats-collector

bin/swift-log-uploader

bin/swift-object-auditor

bin/swift-object-info

bin/swift-object-replicator

bin/swift-object-server

bin/swift-object-updater

bin/swift-proxy-server

doc/source/misc.rst

etc/object-server.conf-sample

etc/proxy-server.conf-sample

setup.py

swift/common/direct_client.py

swift/common/exceptions.py

swift/common/manager.py

swift/common/middleware/acl.py

swift/common/middleware/swauth.py

swift/common/middleware/swift3.py

swift/common/utils.py

swift/obj/auditor.py

swift/obj/replicator.py

swift/obj/server.py

swift/proxy/server.py

swift/stats/access_processor.py

swift/stats/log_processor.py

test/functionalnosetests/test_container.py

test/unit/__init__.py

test/unit/common/middleware/test_ratelimit.py

test/unit/common/middleware/test_swauth.py

test/unit/common/middleware/test_swift3.py

test/unit/common/test_manager.py

test/unit/common/test_utils.py

test/unit/obj/test_auditor.py

test/unit/obj/test_replicator.py

test/unit/obj/test_server.py

test/unit/stats/test_access_processor.py

test/unit/stats/test_log_processor.py

Show diffs side-by-side

added added

removed removed

bin/swauth-add-account

bin/swauth-add-user

bin/swauth-cleanup-tokens

bin/swauth-delete-account

bin/swauth-delete-user

bin/swauth-list

bin/swauth-prep

bin/swauth-set-account-service

bin/swift-account-audit

bin/swift-account-auditor

bin/swift-account-reaper

bin/swift-account-replicator

bin/swift-account-server

bin/swift-account-stats-logger

bin/swift-bench

bin/swift-container-auditor

bin/swift-container-replicator

bin/swift-container-server

bin/swift-container-updater

bin/swift-drive-audit

bin/swift-get-nodes

bin/swift-log-stats-collector

bin/swift-log-uploader

bin/swift-object-auditor

bin/swift-object-info

bin/swift-object-replicator

bin/swift-object-server

bin/swift-object-updater

bin/swift-proxy-server

doc/source/misc.rst

etc/object-server.conf-sample

etc/proxy-server.conf-sample

swift/common/direct_client.py

swift/common/exceptions.py

swift/common/manager.py

swift/common/middleware/acl.py

swift/common/middleware/staticweb.py

swift/common/middleware/swauth.py

swift/common/middleware/swift3.py

swift/common/utils.py

swift/obj/auditor.py

swift/obj/replicator.py

swift/obj/server.py

swift/proxy/server.py

swift/stats/access_processor.py

swift/stats/log_processor.py

test/functionalnosetests/test_container.py

test/probe/test_object_failures.py

test/unit/__init__.py

test/unit/common/middleware/test_ratelimit.py

test/unit/common/middleware/test_staticweb.py

test/unit/common/middleware/test_swauth.py

test/unit/common/middleware/test_swift3.py

test/unit/common/test_manager.py

test/unit/common/test_utils.py

test/unit/obj/test_auditor.py

test/unit/obj/test_replicator.py

test/unit/obj/test_server.py

test/unit/stats/test_access_processor.py

test/unit/stats/test_log_processor.py

Older »