]> 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: ca72b6c 9799858)
Merge branch 'next'
authorYehuda Sadeh <yehuda@inktank.com>
Fri, 16 Aug 2013 17:55:54 +0000 (10:55 -0700)
committerYehuda Sadeh <yehuda@inktank.com>
Fri, 16 Aug 2013 17:55:54 +0000 (10:55 -0700)
Conflicts:
s3tests/functional/test_s3.py

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
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.