From: Josh Durgin <jdurgin@redhat.com>
Date: Mon, 27 Jul 2015 23:42:12 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/next'
X-Git-Tag: v9.1.0~484
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=37e2b7b85bdd244059630eb1131b147c71cd1340;p=ceph.git

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

37e2b7b85bdd244059630eb1131b147c71cd1340