From: Sage Weil <sage@redhat.com>
Date: Tue, 13 Oct 2015 12:24:22 +0000 (-0400)
Subject: Merge branch 'infernalis'
X-Git-Tag: v10.0.0~104
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a375de1ba12a3982860eea21a0bcbeeb01fdb09c;p=ceph.git

Merge branch 'infernalis'
---

a375de1ba12a3982860eea21a0bcbeeb01fdb09c