From: Sage Weil <sage@redhat.com>
Date: Thu, 22 Dec 2016 13:53:23 +0000 (-0600)
Subject: Merge branch 'kraken' into wip-18314
X-Git-Tag: v11.1.1~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F12599%2Fhead;p=ceph.git

Merge branch 'kraken' into wip-18314
---

3824ad3fec51f5de76eabe57df51c299434f43e5