Kota Tsuyuzaki 3ba65cb7ec Merge remote-tracking branch 'remotes/origin/master' into merge-master ... Conflicts: swift/obj/diskfile.py Change-Id: I3b1508c9555bcff9016fd7ba918cebcaa4eb484c		2019-06-05 16:27:22 +09:00
..
functional	Merge remote-tracking branch 'remotes/origin/master' into merge-master	2019-06-05 16:27:22 +09:00
probe	Merge "Increase node_timeout in gate"	2019-04-30 22:12:01 +00:00
s3api	Have a separate s3api functional test suite	2019-05-13 14:03:03 -07:00
unit	Merge remote-tracking branch 'remotes/origin/master' into merge-master	2019-06-05 16:27:22 +09:00
__init__.py	Refactoring, test infrastructure changes and cleanup	2018-05-15 18:18:25 +01:00
sample.conf	Merge "Note s3api compatability requirements in sample.conf"	2019-06-05 04:11:55 +00:00