From: Sage Weil <sage@redhat.com>
Date: Mon, 31 Aug 2015 15:29:14 +0000 (-0400)
Subject: Merge remote-tracking branch 'gh/infernalis'
X-Git-Tag: v9.1.0~252
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ad3f16912b954aa8bf129b3b3dd5c3fe43d1376f;p=ceph.git

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

ad3f16912b954aa8bf129b3b3dd5c3fe43d1376f