From: Sage Weil <sage@redhat.com>
Date: Thu, 6 Oct 2016 16:08:51 +0000 (-0400)
Subject: Merge remote-tracking branch 'gh/kraken'
X-Git-Tag: v11.0.1~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6bb585b8c393862842bd500ffd7ff9def3a138fd;p=ceph.git

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

6bb585b8c393862842bd500ffd7ff9def3a138fd