From: Sage Weil <sage@redhat.com>
Date: Sat, 10 Jan 2015 05:43:49 +0000 (-0800)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.92~37
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=585efcb7e45b0a81ff2f0a5b76fe8c38c848df45;p=ceph.git

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

585efcb7e45b0a81ff2f0a5b76fe8c38c848df45