From: Samuel Just Date: Thu, 20 Mar 2014 17:13:05 +0000 (-0700) Subject: Merge pull request #1509 from guangyy/wip-folder-merge X-Git-Tag: v0.79~118 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=048ca96c4de509b35d61111b0c751e0faf3b07e5;p=ceph.git Merge pull request #1509 from guangyy/wip-folder-merge Make it possible for FileStore to be in a state which never do merge and keep it backward compatible Reviewed-by: Samuel Just --- 048ca96c4de509b35d61111b0c751e0faf3b07e5