From: Josh Durgin <jdurgin@redhat.com>
Date: Thu, 18 Jun 2015 01:23:11 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Tag: v9.0.3~168
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9f4c6e479f55581e53336dfb7aaf86ffba081b8b;p=ceph.git

Merge branch 'next'
---

9f4c6e479f55581e53336dfb7aaf86ffba081b8b