Merge PR #23694 into master

author Sage Weil <sage@redhat.com>

Wed, 12 Sep 2018 16:46:42 +0000 (11:46 -0500)

committer Sage Weil <sage@redhat.com>

Wed, 12 Sep 2018 16:46:42 +0000 (11:46 -0500)
author Sage Weil <sage@redhat.com>
Wed, 12 Sep 2018 16:46:42 +0000 (11:46 -0500)
committer Sage Weil <sage@redhat.com>
Wed, 12 Sep 2018 16:46:42 +0000 (11:46 -0500)
diff --cc PendingReleaseNotes
Simple merge
diff --cc src/common/options.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Wed, 12 Sep 2018 16:46:42 +0000 (11:46 -0500)
committer	Sage Weil <sage@redhat.com>
	Wed, 12 Sep 2018 16:46:42 +0000 (11:46 -0500)
		1	2
PendingReleaseNotes	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history