From: Yehuda Sadeh <yehuda@inktank.com>
Date: Thu, 22 Jan 2015 23:24:07 +0000 (-0800)
Subject: Merge branch 'wip-bi-sharding-3' into wip-rgw-versioning-3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f33a86b388597efd4734c5b0157041b6d9395df7;p=s3-tests.git

Merge branch 'wip-bi-sharding-3' into wip-rgw-versioning-3

Conflicts:
	s3tests/functional/test_s3.py
---

f33a86b388597efd4734c5b0157041b6d9395df7