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

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

5c8ee3388f4bb7dcec072446a21dcf6183494af3