From: Sage Weil <sage@inktank.com>
Date: Thu, 5 Jun 2014 19:03:00 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.83~132
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a63ee3793d5abb51b771b87493c4c430202506dc;p=ceph.git

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

a63ee3793d5abb51b771b87493c4c430202506dc