From: Yuri Weinstein <yweinste@redhat.com>
Date: Wed, 8 Apr 2020 22:53:07 +0000 (-0700)
Subject: Merge pull request #34354 from smithfarm/wip-44711-nautilus
X-Git-Tag: v14.2.10~146
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8affdb43a3d35ac408aed401538942665b1fdd92;p=ceph.git

Merge pull request #34354 from smithfarm/wip-44711-nautilus

nautilus: mgr/DaemonServer: fix pg merge checks

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
---

8affdb43a3d35ac408aed401538942665b1fdd92