]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cffcf10 fe8a715)
Merge pull request #1509 from guangyy/wip-folder-merge
authorSamuel Just <sam.just@inktank.com>
Thu, 20 Mar 2014 17:13:05 +0000 (10:13 -0700)
committerSamuel Just <sam.just@inktank.com>
Thu, 20 Mar 2014 17:13:05 +0000 (10:13 -0700)
Make it possible for FileStore to be in a state which never do merge and keep it backward compatible

Reviewed-by: Samuel Just <sam.just@inktank.com>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.