]> 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: 66f320a 811e7f6)
Merge remote-tracking branch 'dreamhost/wip-static-website'
authorYehuda Sadeh <yehuda@redhat.com>
Tue, 17 May 2016 23:00:12 +0000 (16:00 -0700)
committerYehuda Sadeh <yehuda@redhat.com>
Tue, 17 May 2016 23:00:12 +0000 (16:00 -0700)
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
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.