From: Josh Durgin <jdurgin@redhat.com>
Date: Thu, 5 Jan 2017 20:59:14 +0000 (-0800)
Subject: Merge branch 'kraken' into wip-oi-mismatch
X-Git-Tag: v11.2.0~17^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F12803%2Fhead;p=ceph.git

Merge branch 'kraken' into wip-oi-mismatch
---

2b2fd847b8c15bd8f3d32d104a1bdf504c21731d