Merge pull request #16530 from xiexingguo/wip-fix-pgtemp

author Sage Weil <sage@newdream.net>

Wed, 26 Jul 2017 18:09:33 +0000 (13:09 -0500)

committer GitHub <noreply@github.com>

Wed, 26 Jul 2017 18:09:33 +0000 (13:09 -0500)
author Sage Weil <sage@newdream.net>
Wed, 26 Jul 2017 18:09:33 +0000 (13:09 -0500)
committer GitHub <noreply@github.com>
Wed, 26 Jul 2017 18:09:33 +0000 (13:09 -0500)
diff --cc qa/workunits/cephtool/test.sh
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Wed, 26 Jul 2017 18:09:33 +0000 (13:09 -0500)
committer	GitHub <noreply@github.com>
	Wed, 26 Jul 2017 18:09:33 +0000 (13:09 -0500)
		1	2
qa/workunits/cephtool/test.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history