Merge pull request #20567 from liewegas/wip-kill-pg-preferred

author Sage Weil <sage@newdream.net>

Mon, 26 Feb 2018 15:13:40 +0000 (09:13 -0600)

committer GitHub <noreply@github.com>

Mon, 26 Feb 2018 15:13:40 +0000 (09:13 -0600)
author Sage Weil <sage@newdream.net>
Mon, 26 Feb 2018 15:13:40 +0000 (09:13 -0600)
committer GitHub <noreply@github.com>
Mon, 26 Feb 2018 15:13:40 +0000 (09:13 -0600)
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Mon, 26 Feb 2018 15:13:40 +0000 (09:13 -0600)
committer	GitHub <noreply@github.com>
	Mon, 26 Feb 2018 15:13:40 +0000 (09:13 -0600)
		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history