]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cb59866 a6c1366)
Merge PR #26504 into master
authorSage Weil <sage@redhat.com>
Fri, 8 Mar 2019 03:58:01 +0000 (21:58 -0600)
committerSage Weil <sage@redhat.com>
Fri, 8 Mar 2019 03:58:01 +0000 (21:58 -0600)
* refs/pull/26504/head:
osd: fixup OpTracker destruct assert, waiting_for_osdmap take ref

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/osd/OSD.cc patch | diff1 | diff2 | blob | history

diff --cc src/osd/OSD.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.