]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit048ca96c4de509b35d61111b0c751e0faf3b07e5
tree361bffc6432ad9bfbb8047bde2c71d2b01664748tree | snapshot
parentcffcf10ff6ab0b618a3148dff92de1e00253b782commit | diff
parentfe8a715c03e60d2508f799ad66887c2cad15e450commit | diff
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 <sam.just@inktank.com>
Unnamed repository; edit this file 'description' to name the repository.