From: Patrick Donnelly <pdonnell@redhat.com>
Date: Sun, 1 Oct 2017 00:43:56 +0000 (-0700)
Subject: Merge PR #18041 into master
X-Git-Tag: v13.0.1~724
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=534c30aca47db1b027edb754e64e6ad31594118e;p=ceph.git

Merge PR #18041 into master

* refs/remotes/upstream/pull/18041/head:
	qa: relax cap expected value check
---

534c30aca47db1b027edb754e64e6ad31594118e