From: Josh Durgin <jdurgin@redhat.com>
Date: Thu, 22 Jan 2015 21:05:12 +0000 (-0800)
Subject: Merge remote-tracking branch 'origin/next'
X-Git-Tag: v0.93~206
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=448a3c333545aba2fc36768345d2daac011cfaca;p=ceph.git

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

448a3c333545aba2fc36768345d2daac011cfaca