]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
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)
commit99207b2c352a65a6059227d0e65e697b20ede44e
tree634ac525c8fd90c8c744561b06908b36a074f2dc
parentcb59866c4673ed0487842902a151ce40c2348639
parenta6c1366d9a480ce66ada42a85a49b43e233206d0
Merge PR #26504 into master

* 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>
src/osd/OSD.cc