From: Sage Weil <sage@redhat.com>
Date: Fri, 8 Mar 2019 03:58:01 +0000 (-0600)
Subject: Merge PR #26504 into master
X-Git-Tag: v14.1.1~23
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=99207b2c352a65a6059227d0e65e697b20ede44e;p=ceph.git

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>
---

99207b2c352a65a6059227d0e65e697b20ede44e