Merge pull request #11367 from linuxbox2/jewel-s3-versioning

author Loic Dachary <loic@dachary.org>

Thu, 13 Oct 2016 15:43:52 +0000 (17:43 +0200)

committer GitHub <noreply@github.com>

Thu, 13 Oct 2016 15:43:52 +0000 (17:43 +0200)
author Loic Dachary <loic@dachary.org>
Thu, 13 Oct 2016 15:43:52 +0000 (17:43 +0200)
committer GitHub <noreply@github.com>
Thu, 13 Oct 2016 15:43:52 +0000 (17:43 +0200)
diff --cc src/rgw/rgw_op.cc
Simple merge
diff --cc src/rgw/rgw_op.h
Simple merge
diff --cc src/rgw/rgw_rest_s3.cc
Simple merge
author	Loic Dachary <loic@dachary.org>
	Thu, 13 Oct 2016 15:43:52 +0000 (17:43 +0200)
committer	GitHub <noreply@github.com>
	Thu, 13 Oct 2016 15:43:52 +0000 (17:43 +0200)
		1	2
src/rgw/rgw_op.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_op.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_s3.cc	patch \|	diff1 \|	diff2 \|	blob \| history