From: Sage Weil <sage@newdream.net>
Date: Mon, 1 May 2017 11:55:30 +0000 (-0500)
Subject: Merge pull request #14887 from liewegas/wip-kraken-x
X-Git-Tag: v12.0.3~157
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1e0162fecc8037c078ad8d358d0ff870a8eb80c3;p=ceph.git

Merge pull request #14887 from liewegas/wip-kraken-x

qa/suites/upgrade/kraken-x: misc fixes
---

1e0162fecc8037c078ad8d358d0ff870a8eb80c3