From: Josh Durgin <jdurgin@redhat.com>
Date: Wed, 12 Nov 2014 19:18:52 +0000 (-0800)
Subject: Merge remote-tracking branch 'origin/next'
X-Git-Tag: v0.90~105
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=94a10196b5cc3141ededc18531c01ab0127270d0;p=ceph.git

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

94a10196b5cc3141ededc18531c01ab0127270d0