Merge pull request #26488 from mogeb/per-pool-scrub-status

author Joao Eduardo Luis <joao@suse.de>

Tue, 7 May 2019 16:50:52 +0000 (17:50 +0100)

committer GitHub <noreply@github.com>

Tue, 7 May 2019 16:50:52 +0000 (17:50 +0100)
author Joao Eduardo Luis <joao@suse.de>
Tue, 7 May 2019 16:50:52 +0000 (17:50 +0100)
committer GitHub <noreply@github.com>
Tue, 7 May 2019 16:50:52 +0000 (17:50 +0100)
diff --cc qa/workunits/cephtool/test.sh
Simple merge
diff --cc src/osd/OSDMap.cc
Simple merge
author	Joao Eduardo Luis <joao@suse.de>
	Tue, 7 May 2019 16:50:52 +0000 (17:50 +0100)
committer	GitHub <noreply@github.com>
	Tue, 7 May 2019 16:50:52 +0000 (17:50 +0100)
		1	2
qa/workunits/cephtool/test.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSDMap.cc	patch \|	diff1 \|	diff2 \|	blob \| history