From: Josh Durgin <jdurgin@redhat.com>
Date: Thu, 22 Jan 2015 00:11:43 +0000 (-0800)
Subject: Merge branch 'next'
X-Git-Tag: v0.93~224
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=07038a79f37cb12d4f00683d012402b34f8633ce;p=ceph.git

Merge branch 'next'
---

07038a79f37cb12d4f00683d012402b34f8633ce