From: Sage Weil <sage@redhat.com>
Date: Tue, 3 Feb 2015 14:52:07 +0000 (-0800)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.93~116
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5a0817938429f94ef023a3c0e953616019c62828;p=ceph.git

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

5a0817938429f94ef023a3c0e953616019c62828