Merge pull request #24417 from pdvian/wip-36138-mimic

author Yuri Weinstein <yweinste@redhat.com>

Wed, 17 Oct 2018 20:01:17 +0000 (16:01 -0400)

committer GitHub <noreply@github.com>

Wed, 17 Oct 2018 20:01:17 +0000 (16:01 -0400)
author Yuri Weinstein <yweinste@redhat.com>
Wed, 17 Oct 2018 20:01:17 +0000 (16:01 -0400)
committer GitHub <noreply@github.com>
Wed, 17 Oct 2018 20:01:17 +0000 (16:01 -0400)
diff --cc src/rgw/rgw_cr_rados.cc
Simple merge
diff --cc src/rgw/rgw_cr_rados.h
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Wed, 17 Oct 2018 20:01:17 +0000 (16:01 -0400)
committer	GitHub <noreply@github.com>
	Wed, 17 Oct 2018 20:01:17 +0000 (16:01 -0400)
		1	2
src/rgw/rgw_cr_rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_cr_rados.h	patch \|	diff1 \|	diff2 \|	blob \| history