From: Yuri Weinstein <yweinste@redhat.com>
Date: Fri, 4 Sep 2020 23:07:22 +0000 (-0700)
Subject: Merge pull request #36981 from neha-ojha/wip-47297-octopus
X-Git-Tag: v15.2.5~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=65d8836383deeacfc8343f8d6563548a4c44c835;p=ceph.git

Merge pull request #36981 from neha-ojha/wip-47297-octopus

octopus: mon/OSDMonitor: only take in osd into consideration when trimming osd…

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
---

65d8836383deeacfc8343f8d6563548a4c44c835