Merge pull request #15050 from asheplyakov/19265-bp-jewel

author Nathan Cutler <presnypreklad@gmail.com>

Wed, 23 Aug 2017 18:52:04 +0000 (20:52 +0200)

committer GitHub <noreply@github.com>

Wed, 23 Aug 2017 18:52:04 +0000 (20:52 +0200)
author Nathan Cutler <presnypreklad@gmail.com>
Wed, 23 Aug 2017 18:52:04 +0000 (20:52 +0200)
committer GitHub <noreply@github.com>
Wed, 23 Aug 2017 18:52:04 +0000 (20:52 +0200)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Nathan Cutler <presnypreklad@gmail.com>
	Wed, 23 Aug 2017 18:52:04 +0000 (20:52 +0200)
committer	GitHub <noreply@github.com>
	Wed, 23 Aug 2017 18:52:04 +0000 (20:52 +0200)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history