]> git-server-git.apps.pok.os.sepia.ceph.com Git - s3-tests.git/commitdiff
projects / s3-tests.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7a0932f 76e8bed)
Merge branch 'wip-bi-sharding-3' into wip-rgw-versioning-3 wip-rgw-versioning-4
authorYehuda Sadeh <yehuda@inktank.com>
Thu, 22 Jan 2015 23:24:07 +0000 (15:24 -0800)
committerYehuda Sadeh <yehuda@inktank.com>
Thu, 22 Jan 2015 23:24:07 +0000 (15:24 -0800)
Conflicts:
s3tests/functional/test_s3.py

1  2 
s3tests/functional/test_s3.py patch | diff1 | diff2 | blob | history

diff --cc s3tests/functional/test_s3.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.