From: Josh Durgin <jdurgin@redhat.com>
Date: Mon, 15 Jun 2015 22:48:08 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Tag: v10.2.6~165^2^2~457
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0ef0cfb9d1c034ccf71d5a8b579dec42e8ab3ed9;p=ceph.git

Merge branch 'next'
---

0ef0cfb9d1c034ccf71d5a8b579dec42e8ab3ed9