]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #7059 from xiexingguo/xxg-wip-14187
authorSage Weil <sage@redhat.com>
Mon, 11 Jan 2016 14:03:29 +0000 (09:03 -0500)
committerSage Weil <sage@redhat.com>
Mon, 11 Jan 2016 14:03:29 +0000 (09:03 -0500)
osd: misc FileStore fixes

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/os/filestore/FileStore.cc

Simple merge