From: Sage Weil <sage@redhat.com>
Date: Sun, 16 Oct 2016 03:28:03 +0000 (-0500)
Subject: Merge pull request #1207 from ceph/wip-kraken
X-Git-Tag: v11.1.1~58^2^2~77
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5af2a01e4b5fb2b8fda9ff1755c03f6beebbc73e;p=ceph.git

Merge pull request #1207 from ceph/wip-kraken

more kraken upgrade fixes
---

5af2a01e4b5fb2b8fda9ff1755c03f6beebbc73e