Merge pull request #16059 from vumrao/wip-vumrao-20353

author Nathan Cutler <presnypreklad@gmail.com>

Thu, 31 Aug 2017 08:24:21 +0000 (10:24 +0200)

committer GitHub <noreply@github.com>

Thu, 31 Aug 2017 08:24:21 +0000 (10:24 +0200)
author Nathan Cutler <presnypreklad@gmail.com>
Thu, 31 Aug 2017 08:24:21 +0000 (10:24 +0200)
committer GitHub <noreply@github.com>
Thu, 31 Aug 2017 08:24:21 +0000 (10:24 +0200)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Nathan Cutler <presnypreklad@gmail.com>
	Thu, 31 Aug 2017 08:24:21 +0000 (10:24 +0200)
committer	GitHub <noreply@github.com>
	Thu, 31 Aug 2017 08:24:21 +0000 (10:24 +0200)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history