From: Sage Weil <sage@inktank.com>
Date: Fri, 27 Jun 2014 19:55:44 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Tag: v0.83~30
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=eb3963f849a92751a1c5c98bffb61b2bd91e5a37;p=ceph.git

Merge branch 'next'
---

eb3963f849a92751a1c5c98bffb61b2bd91e5a37