Merge pull request #26729 from xiexingguo/wip-recovery-priority-restrictions

author Xie Xingguo <xie.xingguo@zte.com.cn>

Tue, 5 Mar 2019 12:16:18 +0000 (20:16 +0800)

committer GitHub <noreply@github.com>

Tue, 5 Mar 2019 12:16:18 +0000 (20:16 +0800)
author Xie Xingguo <xie.xingguo@zte.com.cn>
Tue, 5 Mar 2019 12:16:18 +0000 (20:16 +0800)
committer GitHub <noreply@github.com>
Tue, 5 Mar 2019 12:16:18 +0000 (20:16 +0800)
diff --cc qa/workunits/cephtool/test.sh
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Xie Xingguo <xie.xingguo@zte.com.cn>
	Tue, 5 Mar 2019 12:16:18 +0000 (20:16 +0800)
committer	GitHub <noreply@github.com>
	Tue, 5 Mar 2019 12:16:18 +0000 (20:16 +0800)
		1	2
qa/workunits/cephtool/test.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history