Merge pull request #12539 from liewegas/wip-mon-pg-creates

author Sage Weil <sage@newdream.net>

Thu, 9 Feb 2017 02:52:18 +0000 (20:52 -0600)

committer GitHub <noreply@github.com>

Thu, 9 Feb 2017 02:52:18 +0000 (20:52 -0600)
author Sage Weil <sage@newdream.net>
Thu, 9 Feb 2017 02:52:18 +0000 (20:52 -0600)
committer GitHub <noreply@github.com>
Thu, 9 Feb 2017 02:52:18 +0000 (20:52 -0600)
diff --cc src/mon/MonCommands.h
Simple merge
diff --cc src/mon/PGMonitor.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Thu, 9 Feb 2017 02:52:18 +0000 (20:52 -0600)
committer	GitHub <noreply@github.com>
	Thu, 9 Feb 2017 02:52:18 +0000 (20:52 -0600)
		1	2
src/mon/MonCommands.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/PGMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history