From: Tamilarasi Muthamizhan <tmuthami@redhat.com>
Date: Fri, 6 Jan 2017 21:48:41 +0000 (-0800)
Subject: Merge pull request #12814 from yuriw/kraken
X-Git-Tag: v11.2.0~16
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=59ae21bdd42374816a8a411e3f02d5b6d07c34e2;p=ceph.git

Merge pull request #12814 from yuriw/kraken

Kraken
---

59ae21bdd42374816a8a411e3f02d5b6d07c34e2