From: Sage Weil <sage@redhat.com>
Date: Wed, 10 Jun 2015 17:14:46 +0000 (-0400)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v9.0.2~16
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c06fd71a1a3c7ef78fdc718a063beb1edb93a04a;p=ceph.git

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

c06fd71a1a3c7ef78fdc718a063beb1edb93a04a