Merge remote-tracking branch 'private/wip-mon-snap-caps'

author Sage Weil <sage@redhat.com>

Mon, 9 Jul 2018 13:29:32 +0000 (08:29 -0500)

committer Sage Weil <sage@redhat.com>

Mon, 9 Jul 2018 13:29:32 +0000 (08:29 -0500)
author Sage Weil <sage@redhat.com>
Mon, 9 Jul 2018 13:29:32 +0000 (08:29 -0500)
committer Sage Weil <sage@redhat.com>
Mon, 9 Jul 2018 13:29:32 +0000 (08:29 -0500)
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/mon/OSDMonitor.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Mon, 9 Jul 2018 13:29:32 +0000 (08:29 -0500)
committer	Sage Weil <sage@redhat.com>
	Mon, 9 Jul 2018 13:29:32 +0000 (08:29 -0500)
		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.h	patch \|	diff1 \|	diff2 \|	blob \| history