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

Merge branch 'next'
---

4a3f615068a21dfb4955ad601e5ad51dbbbef2a1