Merge pull request #13004 from asheplyakov/jewel-bp-18563

author Loic Dachary <loic@dachary.org>

Mon, 20 Feb 2017 15:41:29 +0000 (16:41 +0100)

committer GitHub <noreply@github.com>

Mon, 20 Feb 2017 15:41:29 +0000 (16:41 +0100)
author Loic Dachary <loic@dachary.org>
Mon, 20 Feb 2017 15:41:29 +0000 (16:41 +0100)
committer GitHub <noreply@github.com>
Mon, 20 Feb 2017 15:41:29 +0000 (16:41 +0100)
diff --cc src/rgw/rgw_bucket.cc
Simple merge
diff --cc src/rgw/rgw_metadata.cc
Simple merge
diff --cc src/rgw/rgw_rados.cc
Simple merge
author	Loic Dachary <loic@dachary.org>
	Mon, 20 Feb 2017 15:41:29 +0000 (16:41 +0100)
committer	GitHub <noreply@github.com>
	Mon, 20 Feb 2017 15:41:29 +0000 (16:41 +0100)
		1	2
src/rgw/rgw_bucket.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_metadata.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history