Merge pull request #21717 from croit/luminous-23915

author Yuri Weinstein <yweinste@redhat.com>

Thu, 3 May 2018 13:50:51 +0000 (06:50 -0700)

committer GitHub <noreply@github.com>

Thu, 3 May 2018 13:50:51 +0000 (06:50 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Thu, 3 May 2018 13:50:51 +0000 (06:50 -0700)
committer GitHub <noreply@github.com>
Thu, 3 May 2018 13:50:51 +0000 (06:50 -0700)
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/osd/osd_types.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Thu, 3 May 2018 13:50:51 +0000 (06:50 -0700)
committer	GitHub <noreply@github.com>
	Thu, 3 May 2018 13:50:51 +0000 (06:50 -0700)
		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.cc	patch \|	diff1 \|	diff2 \|	blob \| history