From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 28 Jul 2017 00:54:59 +0000 (-0700)
Subject: Merge PR #16435 into master
X-Git-Tag: v12.1.2~60
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fb039383e9a71948a995aa326842e0bdcf5795b5;p=ceph.git

Merge PR #16435 into master

* refs/remotes/upstream/pull/16435/head:
	qa: whitelist trim error during powercycle tests

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

fb039383e9a71948a995aa326842e0bdcf5795b5