From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 1 May 2019 20:22:58 +0000 (-0700)
Subject: Merge PR #27763 into master
X-Git-Tag: v15.1.0~2775
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=012809cf581f4a75f2ba0cfa9b9cb569f44ba52a;p=ceph.git

Merge PR #27763 into master

* refs/pull/27763/head:
	common/PriorityCache: fix over-aggressive assert when mem limited

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
---

012809cf581f4a75f2ba0cfa9b9cb569f44ba52a