]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #9605 from liewegas/wip-statfs
authorSage Weil <sage@redhat.com>
Mon, 20 Jun 2016 16:39:03 +0000 (12:39 -0400)
committerGitHub <noreply@github.com>
Mon, 20 Jun 2016 16:39:03 +0000 (12:39 -0400)
os: simplify store_statfs_t

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
1  2 
src/common/config_opts.h
src/os/bluestore/BlueStore.cc
src/osd/OSD.cc
src/osd/osd_types.cc
src/osd/osd_types.h
src/test/objectstore/store_test.cc

Simple merge
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
Simple merge
Simple merge
Simple merge