]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b08116b 0cbc76b)
Merge pull request #7283 from xiexingguo/xxg-wip-14407
authorSage Weil <sage@redhat.com>
Tue, 26 Jan 2016 01:59:35 +0000 (20:59 -0500)
committerSage Weil <sage@redhat.com>
Tue, 26 Jan 2016 01:59:35 +0000 (20:59 -0500)
os/bluestore/kstore: fix nid overwritten logic

http://pulpito.ceph.com/sage-2016-01-25_07:39:08-rados-wip-sage-testing2---basic-smithi/

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

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