Merge pull request #15535 from gregsfortytwo/wip-jumbo-ping

author Yuri Weinstein <yuri.weinstein@gmail.com>

Wed, 14 Jun 2017 20:10:05 +0000 (13:10 -0700)

committer GitHub <noreply@github.com>

Wed, 14 Jun 2017 20:10:05 +0000 (13:10 -0700)
author Yuri Weinstein <yuri.weinstein@gmail.com>
Wed, 14 Jun 2017 20:10:05 +0000 (13:10 -0700)
committer GitHub <noreply@github.com>
Wed, 14 Jun 2017 20:10:05 +0000 (13:10 -0700)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Yuri Weinstein <yuri.weinstein@gmail.com>
	Wed, 14 Jun 2017 20:10:05 +0000 (13:10 -0700)
committer	GitHub <noreply@github.com>
	Wed, 14 Jun 2017 20:10:05 +0000 (13:10 -0700)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history