From: Sage Weil <sage@inktank.com>
Date: Sat, 5 Jul 2014 04:18:55 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.84~146
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dd5b60b4f1c65702a71111e1e63346f3a056057d;p=ceph.git

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

dd5b60b4f1c65702a71111e1e63346f3a056057d