From: Sage Weil <sage@inktank.com>
Date: Tue, 30 Apr 2013 03:58:15 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Tag: v0.62~50
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7d4c0dcfe4fda961e59db0f03a96e2a34f469fc6;p=ceph.git

Merge branch 'next'
---

7d4c0dcfe4fda961e59db0f03a96e2a34f469fc6