From: Kefu Chai <tchaikov@gmail.com>
Date: Thu, 18 May 2017 16:06:35 +0000 (+0800)
Subject: Merge pull request #15126 from batrick/i19934
X-Git-Tag: v12.1.0~10^2~78
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=450d6cb5d04aa711e2a184c29e1a52b3d933a28b;p=ceph.git

Merge pull request #15126 from batrick/i19934

qa: silence upgrade test failure

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

450d6cb5d04aa711e2a184c29e1a52b3d933a28b