From: Kefu Chai <kchai@redhat.com>
Date: Thu, 27 Jun 2019 11:24:36 +0000 (+0800)
Subject: Merge pull request #28653 from zhangsw/cleanup-doc-sample.conf
X-Git-Tag: v15.1.0~2361
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a53c396ef0df73973fdecd3fea0e07e15fbf1040;p=ceph.git

Merge pull request #28653 from zhangsw/cleanup-doc-sample.conf

sample.ceph.conf: correct the default value of filestore merge threshold

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

a53c396ef0df73973fdecd3fea0e07e15fbf1040