Merge pull request #17662 from shashalu/fix-set-bucket-versioning

author Yuri Weinstein <yuri.weinstein@gmail.com>

Thu, 28 Sep 2017 21:58:18 +0000 (14:58 -0700)

committer GitHub <noreply@github.com>

Thu, 28 Sep 2017 21:58:18 +0000 (14:58 -0700)
author Yuri Weinstein <yuri.weinstein@gmail.com>
Thu, 28 Sep 2017 21:58:18 +0000 (14:58 -0700)
committer GitHub <noreply@github.com>
Thu, 28 Sep 2017 21:58:18 +0000 (14:58 -0700)
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	Yuri Weinstein <yuri.weinstein@gmail.com>
	Thu, 28 Sep 2017 21:58:18 +0000 (14:58 -0700)
committer	GitHub <noreply@github.com>
	Thu, 28 Sep 2017 21:58:18 +0000 (14:58 -0700)
		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