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

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

6251ff6a3ec1e22904583f9dc63ee3391714713b