Merge pull request #337 from ceph/wip-python-3-port

author Casey Bodley <cbodley@users.noreply.github.com>

Wed, 15 Jan 2020 13:48:54 +0000 (08:48 -0500)

committer GitHub <noreply@github.com>

Wed, 15 Jan 2020 13:48:54 +0000 (08:48 -0500)
author Casey Bodley <cbodley@users.noreply.github.com>
Wed, 15 Jan 2020 13:48:54 +0000 (08:48 -0500)
committer GitHub <noreply@github.com>
Wed, 15 Jan 2020 13:48:54 +0000 (08:48 -0500)
diff --cc s3tests_boto3/functional/__init__.py
Simple merge
diff --cc s3tests_boto3/functional/test_s3.py
Simple merge
author	Casey Bodley <cbodley@users.noreply.github.com>
	Wed, 15 Jan 2020 13:48:54 +0000 (08:48 -0500)
committer	GitHub <noreply@github.com>
	Wed, 15 Jan 2020 13:48:54 +0000 (08:48 -0500)
		1	2
s3tests_boto3/functional/__init__.py	patch \|	diff1 \|	diff2 \|	blob \| history
s3tests_boto3/functional/test_s3.py	patch \|	diff1 \|	diff2 \|	blob \| history