Merge pull request #27898 from alimaredia/wip-rgw-thread-yield-context-get-bucket...

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

Thu, 30 May 2019 19:48:42 +0000 (15:48 -0400)

committer GitHub <noreply@github.com>

Thu, 30 May 2019 19:48:42 +0000 (15:48 -0400)
author Casey Bodley <cbodley@users.noreply.github.com>
Thu, 30 May 2019 19:48:42 +0000 (15:48 -0400)
committer GitHub <noreply@github.com>
Thu, 30 May 2019 19:48:42 +0000 (15:48 -0400)
diff --cc src/rgw/rgw_admin.cc
Simple merge
diff --cc src/rgw/rgw_lc.cc
Simple merge
author	Casey Bodley <cbodley@users.noreply.github.com>
	Thu, 30 May 2019 19:48:42 +0000 (15:48 -0400)
committer	GitHub <noreply@github.com>
	Thu, 30 May 2019 19:48:42 +0000 (15:48 -0400)
		1	2
src/rgw/rgw_admin.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_lc.cc	patch \|	diff1 \|	diff2 \|	blob \| history