From: Sage Weil <sage@inktank.com>
Date: Wed, 27 Feb 2013 01:29:48 +0000 (-0800)
Subject: Merge branch 'next'
X-Git-Tag: v0.59~92
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d6b4a7be209a9c4dc5bfb4eb5fbae947b6983276;p=ceph.git

Merge branch 'next'
---

d6b4a7be209a9c4dc5bfb4eb5fbae947b6983276