From: Sage Weil <sage@inktank.com>
Date: Mon, 19 May 2014 16:49:28 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.82~78
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9e80c29c2c59ac920768d37628d09192bac265bd;p=ceph.git

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

9e80c29c2c59ac920768d37628d09192bac265bd