From: Sage Weil <sage@redhat.com>
Date: Wed, 10 Jun 2015 17:15:11 +0000 (-0400)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v10.2.6~165^2^2~461
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dab2ae2e3d930237f83c9fe67aa4ec03357f3bef;p=ceph.git

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

dab2ae2e3d930237f83c9fe67aa4ec03357f3bef