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

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

5e8299f0121d07355aa7eddfe53297504fbcdcfe