From: Sage Weil <sage@redhat.com>
Date: Sat, 3 Oct 2015 16:42:00 +0000 (-0400)
Subject: Merge remote-tracking branch 'gh/infernalis'
X-Git-Tag: v10.0.0~119
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d1e697628931775e7fcdbb79a76ddd8e7dedffd5;p=ceph.git

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

d1e697628931775e7fcdbb79a76ddd8e7dedffd5