From: Sage Weil <sage@inktank.com>
Date: Tue, 3 Jun 2014 05:24:48 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.82~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=49512447261e00ba9d1d562410350e64ffe8ff57;p=ceph.git

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

49512447261e00ba9d1d562410350e64ffe8ff57