From: Yuri Weinstein <yweinste@redhat.com>
Date: Fri, 25 Jan 2019 16:07:54 +0000 (-0800)
Subject: Merge pull request #25605 from smithfarm/wip-37698-mimic
X-Git-Tag: v13.2.5~112
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c8b5b37608d46ed76687e74631b9c13e02537a99;p=ceph.git

Merge pull request #25605 from smithfarm/wip-37698-mimic

mimic: osd: failed assert when osd_memory_target options mismatch

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
---

c8b5b37608d46ed76687e74631b9c13e02537a99