Merge pull request #20399 from smithfarm/wip-22942-luminous

author Yuri Weinstein <yweinste@redhat.com>

Thu, 29 Mar 2018 13:21:27 +0000 (06:21 -0700)

committer GitHub <noreply@github.com>

Thu, 29 Mar 2018 13:21:27 +0000 (06:21 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Thu, 29 Mar 2018 13:21:27 +0000 (06:21 -0700)
committer GitHub <noreply@github.com>
Thu, 29 Mar 2018 13:21:27 +0000 (06:21 -0700)
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/mon/OSDMonitor.h
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Thu, 29 Mar 2018 13:21:27 +0000 (06:21 -0700)
committer	GitHub <noreply@github.com>
	Thu, 29 Mar 2018 13:21:27 +0000 (06:21 -0700)
		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.h	patch \|	diff1 \|	diff2 \|	blob \| history