From: Dan Mick <dan.mick@inktank.com>
Date: Wed, 9 Jan 2013 23:11:36 +0000 (-0800)
Subject: Merge branch 'next'
X-Git-Tag: v0.57~231
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=133e4e34738513e299ef6fd54997a6dee6b48d4a;p=ceph.git

Merge branch 'next'

Want to get various rbd-related fixes together for upgrade testing
---

133e4e34738513e299ef6fd54997a6dee6b48d4a