Samuel Merritt 3895441afd Merge branch 'master' into ec ... Conflicts: swift/container/server.py swift/proxy/controllers/base.py swift/proxy/controllers/obj.py test/unit/container/test_server.py test/unit/obj/test_server.py test/unit/proxy/controllers/test_account.py test/unit/proxy/controllers/test_container.py test/unit/proxy/test_server.py tox.ini Change-Id: I3e3bd3e1186c36b2e4e75a611eaed15afc419712		2014-01-13 16:11:31 -08:00
..
functional	Move the tests from functionalnosetests	2014-01-07 15:58:11 +08:00
probe	Remove swiftclient dep on direct_client	2013-12-24 03:11:43 -08:00
unit	Merge branch 'master' into ec	2014-01-13 16:11:31 -08:00
__init__.py	Change OpenStack LLC to Foundation	2013-09-20 01:02:31 +08:00
sample.conf	Add option to make probetests more brittle	2013-07-19 01:39:42 -07:00