]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #16435 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 28 Jul 2017 00:54:59 +0000 (17:54 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 28 Jul 2017 00:54:59 +0000 (17:54 -0700)
* refs/remotes/upstream/pull/16435/head:
qa: whitelist trim error during powercycle tests

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

Trivial merge