From: Nathan Cutler <presnypreklad@gmail.com>
Date: Tue, 1 Aug 2017 18:19:15 +0000 (+0200)
Subject: Merge pull request #14612 from smithfarm/wip-19651
X-Git-Tag: v11.2.1~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0bab3f3a1026c41736e06f72f8ede68b3386d772;p=ceph.git

Merge pull request #14612 from smithfarm/wip-19651

tests: backport Sage's fixes to qa/suites/upgrade/jewel-x

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

0bab3f3a1026c41736e06f72f8ede68b3386d772