From: Sage Weil <sage@inktank.com>
Date: Tue, 11 Dec 2012 01:08:26 +0000 (-0800)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.57~330
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=331c25046ecd99ec10c5835e8e674ca819e6168a;p=ceph.git

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

331c25046ecd99ec10c5835e8e674ca819e6168a