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

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

4bb082eedea3d9152fa3983d5b1e967e060a2a74