From: Sage Weil <sage@redhat.com>
Date: Mon, 5 Jan 2015 19:16:57 +0000 (-0800)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.92~76
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d253badb8d0403d84be95c81abbd38c43d2ff8e4;p=ceph.git

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

d253badb8d0403d84be95c81abbd38c43d2ff8e4