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

Merge branch 'next'
---

2314abbfb0a01f6ee21d5e44035de7e40d552394