]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6aa9a47 1badcdd)
Merge pull request #7658 from majianpeng/bluestore
authorSage Weil <sage@redhat.com>
Wed, 24 Feb 2016 18:40:26 +0000 (10:40 -0800)
committerSage Weil <sage@redhat.com>
Wed, 24 Feb 2016 18:40:26 +0000 (10:40 -0800)
osd: bluestore: misc fixes

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/common/config_opts.h patch | diff1 | diff2 | blob | history
src/os/bluestore/BlueStore.cc patch | diff1 | diff2 | blob | history

diff --cc src/common/config_opts.h
Simple merge
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.