From: Sage Weil <sage@redhat.com>
Date: Mon, 17 Oct 2016 17:35:45 +0000 (-0400)
Subject: Merge remote-tracking branch 'gh/kraken'
X-Git-Tag: v11.1.0~618
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9a8bcf8fbf0eb9390e6d2115149ba550ed70c40b;p=ceph.git

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

9a8bcf8fbf0eb9390e6d2115149ba550ed70c40b