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

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

72a0185eccb8e40ef2369bc46c97df2a153976b2