Merge pull request #27188 from smithfarm/wip-38901-mimic

author Nathan Cutler <presnypreklad@gmail.com>

Fri, 12 Apr 2019 15:13:57 +0000 (17:13 +0200)

committer GitHub <noreply@github.com>

Fri, 12 Apr 2019 15:13:57 +0000 (17:13 +0200)
author Nathan Cutler <presnypreklad@gmail.com>
Fri, 12 Apr 2019 15:13:57 +0000 (17:13 +0200)
committer GitHub <noreply@github.com>
Fri, 12 Apr 2019 15:13:57 +0000 (17:13 +0200)
diff --cc doc/rados/configuration/osd-config-ref.rst
Simple merge
author	Nathan Cutler <presnypreklad@gmail.com>
	Fri, 12 Apr 2019 15:13:57 +0000 (17:13 +0200)
committer	GitHub <noreply@github.com>
	Fri, 12 Apr 2019 15:13:57 +0000 (17:13 +0200)