From: Sage Weil <sage@inktank.com>
Date: Thu, 18 Oct 2012 06:00:25 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Tag: v0.55~254
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b5ce39fa6c488f2513b2f3e04160d241a87774bc;p=ceph.git

Merge branch 'next'
---

b5ce39fa6c488f2513b2f3e04160d241a87774bc