From: Sage Weil <sage@inktank.com>
Date: Fri, 30 May 2014 17:13:59 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.82~21
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3b884becca32fb5fb9091a80e4603c3de262bdee;p=ceph.git

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

3b884becca32fb5fb9091a80e4603c3de262bdee