From: Samuel Just Date: Wed, 7 May 2014 18:05:59 +0000 (-0700) Subject: Merge pull request #1783 from guangyy/folder-merge-doc X-Git-Tag: v0.81~53 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=499b29a3230731082dfc2baed9e8aaa0413c8569;p=ceph.git Merge pull request #1783 from guangyy/folder-merge-doc Update doc to reflect the bahavior change for filestore_merge_threshold setting. Reviewed-by: Samuel Just --- 499b29a3230731082dfc2baed9e8aaa0413c8569