Merge pull request #23485 from javacruft/misc-32bit-fixes

author Kefu Chai <tchaikov@gmail.com>

Thu, 16 Aug 2018 12:57:59 +0000 (20:57 +0800)

committer GitHub <noreply@github.com>

Thu, 16 Aug 2018 12:57:59 +0000 (20:57 +0800)
author Kefu Chai <tchaikov@gmail.com>
Thu, 16 Aug 2018 12:57:59 +0000 (20:57 +0800)
committer GitHub <noreply@github.com>
Thu, 16 Aug 2018 12:57:59 +0000 (20:57 +0800)
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Thu, 16 Aug 2018 12:57:59 +0000 (20:57 +0800)
committer	GitHub <noreply@github.com>
	Thu, 16 Aug 2018 12:57:59 +0000 (20:57 +0800)
		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history