Merge pull request #22042 from liewegas/wip-rm-pool-race

author Sage Weil <sage@newdream.net>

Mon, 21 May 2018 02:24:37 +0000 (21:24 -0500)

committer GitHub <noreply@github.com>

Mon, 21 May 2018 02:24:37 +0000 (21:24 -0500)
author Sage Weil <sage@newdream.net>
Mon, 21 May 2018 02:24:37 +0000 (21:24 -0500)
committer GitHub <noreply@github.com>
Mon, 21 May 2018 02:24:37 +0000 (21:24 -0500)
diff --cc src/osdc/Objecter.cc
Simple merge
diff --cc src/test/librados/misc.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Mon, 21 May 2018 02:24:37 +0000 (21:24 -0500)
committer	GitHub <noreply@github.com>
	Mon, 21 May 2018 02:24:37 +0000 (21:24 -0500)
		1	2
src/osdc/Objecter.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/librados/misc.cc	patch \|	diff1 \|	diff2 \|	blob \| history