From: Sage Weil <sage@inktank.com>
Date: Mon, 30 Jun 2014 23:50:01 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.84~165
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f4e69baecbfaa14332c59401f23333cbad2bdd9b;p=ceph.git

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

f4e69baecbfaa14332c59401f23333cbad2bdd9b