From: Sage Weil <sage@redhat.com>
Date: Wed, 23 Sep 2015 14:46:51 +0000 (-0400)
Subject: Merge remote-tracking branch 'gh/infernalis'
X-Git-Tag: v9.1.0~87
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3afd5178ff2d61b89602265451ec35d5c8ecf6d0;p=ceph.git

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

3afd5178ff2d61b89602265451ec35d5c8ecf6d0