From: Sage Weil <sage@redhat.com>
Date: Fri, 25 Sep 2015 12:59:54 +0000 (-0400)
Subject: Merge remote-tracking branch 'gh/infernalis'
X-Git-Tag: v9.1.0~74
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a2d806363ea4a07567697045ead73dfa4c3a1cea;p=ceph.git

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

a2d806363ea4a07567697045ead73dfa4c3a1cea