From: Sage Weil <sage@redhat.com>
Date: Fri, 15 Mar 2019 20:29:04 +0000 (-0500)
Subject: Merge PR #26995 into nautilus
X-Git-Tag: v14.2.0~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c2d332262886c26fca82172c2643497428519385;p=ceph.git

Merge PR #26995 into nautilus

* refs/pull/26995/head:
	osd/PG: fix pg merge check for rc clusters

Reviewed-by: Neha Ojha <nojha@redhat.com>
---

c2d332262886c26fca82172c2643497428519385