]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6c744ea 90c3c20)
Merge PR #24686 into master
authorSage Weil <sage@redhat.com>
Mon, 29 Oct 2018 13:46:43 +0000 (08:46 -0500)
committerSage Weil <sage@redhat.com>
Mon, 29 Oct 2018 13:46:43 +0000 (08:46 -0500)
* refs/pull/24686/head:
os/bluestore: show compress and buffered from WriteContext
os/bluestore: fix rename race with trim on replacement onode at old name

Reviewed-by: Jianpeng Ma <jianpeng.ma@intel.com>
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
1  2 
src/os/bluestore/BlueStore.cc patch | diff1 | diff2 | blob | history

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