paul luse 5b11780a10 Merge master to feature/ec ... Conflicts: requirements.txt swift/common/storage_policy.py swift/proxy/controllers/obj.py test/unit/common/test_storage_policy.py test/unit/proxy/test_server.py Change-Id: I280015c82af13f04dc0741540dbb7c1fc3f51761		2015-03-24 16:04:23 -07:00
..
functional	Merge master to feature/ec	2015-03-24 16:04:23 -07:00
probe	fixed ugly code pattern in probe tests	2015-02-26 14:32:31 -08:00
unit	Merge master to feature/ec	2015-03-24 16:04:23 -07:00
__init__.py	In-process swift server for functional tests	2014-04-29 08:45:11 -04:00
sample.conf	Minor change to the service token sample test config	2015-02-27 11:54:50 +00:00