From: John Spray <john.spray@redhat.com>
Date: Thu, 13 Aug 2015 10:00:50 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/next'
X-Git-Tag: v9.1.0~379
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=593fcc1af8e29edfd1a88a3c13e8cd90ce2086f1;p=ceph.git

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

593fcc1af8e29edfd1a88a3c13e8cd90ce2086f1