Merge pull request #20896 from smithfarm/wip-23349-luminous

author Abhishek L <abhishek.lekshmanan@gmail.com>

Thu, 5 Apr 2018 17:21:01 +0000 (19:21 +0200)

committer GitHub <noreply@github.com>

Thu, 5 Apr 2018 17:21:01 +0000 (19:21 +0200)
author Abhishek L <abhishek.lekshmanan@gmail.com>
Thu, 5 Apr 2018 17:21:01 +0000 (19:21 +0200)
committer GitHub <noreply@github.com>
Thu, 5 Apr 2018 17:21:01 +0000 (19:21 +0200)
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/rgw/rgw_rados.cc
Simple merge
author	Abhishek L <abhishek.lekshmanan@gmail.com>
	Thu, 5 Apr 2018 17:21:01 +0000 (19:21 +0200)
committer	GitHub <noreply@github.com>
	Thu, 5 Apr 2018 17:21:01 +0000 (19:21 +0200)
		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history