From: Sage Weil <sage@redhat.com>
Date: Thu, 22 Dec 2016 03:21:41 +0000 (-0500)
Subject: Merge remote-tracking branch 'gh/kraken'
X-Git-Tag: v12.0.0~404
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=94bb715acbdafac2a730a3f83a29f633dc30bddf;p=ceph.git

Merge remote-tracking branch 'gh/kraken'
---

94bb715acbdafac2a730a3f83a29f633dc30bddf