Merge pull request #19998 from liewegas/wip-22715

author Sage Weil <sage@newdream.net>

Sun, 21 Jan 2018 20:29:40 +0000 (14:29 -0600)

committer GitHub <noreply@github.com>

Sun, 21 Jan 2018 20:29:40 +0000 (14:29 -0600)
author Sage Weil <sage@newdream.net>
Sun, 21 Jan 2018 20:29:40 +0000 (14:29 -0600)
committer GitHub <noreply@github.com>
Sun, 21 Jan 2018 20:29:40 +0000 (14:29 -0600)
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/osd/PG.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Sun, 21 Jan 2018 20:29:40 +0000 (14:29 -0600)
committer	GitHub <noreply@github.com>
	Sun, 21 Jan 2018 20:29:40 +0000 (14:29 -0600)
		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history