From: Greg Farnum <gfarnum@redhat.com>
Date: Wed, 7 Oct 2015 17:56:35 +0000 (-0700)
Subject: Merge branch 'infernalis'
X-Git-Tag: v10.0.0~117
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=84903b32545b3fb58100630a8ab6469a820335e3;p=ceph.git

Merge branch 'infernalis'
---

84903b32545b3fb58100630a8ab6469a820335e3