From: Sage Weil <sage@redhat.com>
Date: Tue, 18 Aug 2015 15:52:53 +0000 (-0400)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v9.1.0~356
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f2cbbdd7a9032b78f71ce9c4395a1f34f5093b22;p=ceph.git

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

f2cbbdd7a9032b78f71ce9c4395a1f34f5093b22