From: Sage Weil <sage@inktank.com>
Date: Wed, 8 Aug 2012 20:05:12 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.51~36
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1839105977b6adee6d1ea5ae8a98d435cd94a47f;p=ceph.git

Merge remote-tracking branch 'gh/next'
---

1839105977b6adee6d1ea5ae8a98d435cd94a47f