From: Sage Weil <sage@redhat.com>
Date: Fri, 5 May 2017 22:01:59 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/kraken'
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ccc273180b8074f13e375ed2ecf4a05bc32e5969;p=ceph-object-corpus.git

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

ccc273180b8074f13e375ed2ecf4a05bc32e5969