From: Josh Durgin <josh.durgin@inktank.com>
Date: Thu, 30 Jan 2014 23:40:09 +0000 (-0800)
Subject: Merge remote-tracking branch 'origin/next'
X-Git-Tag: v0.78~240
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=36658157382e938f5c7042487393d541aa815740;p=ceph.git

Merge remote-tracking branch 'origin/next'

Conflicts:
	src/test/ceph-disk.sh
---

36658157382e938f5c7042487393d541aa815740