From: John Spray <john.spray@redhat.com>
Date: Thu, 23 Jul 2015 19:26:51 +0000 (+0100)
Subject: Merge branch 'next'
X-Git-Tag: v9.1.0~490
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f7bda9567d2a1acf015ab891eb5bb9ca0cdc8396;p=ceph.git

Merge branch 'next'
---

f7bda9567d2a1acf015ab891eb5bb9ca0cdc8396