From: Sage Weil <sage@inktank.com>
Date: Tue, 22 Oct 2013 20:32:01 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/wip-6242-b' into next
X-Git-Tag: v0.72-rc1~23
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dbbf9938e308c29633ade363ef5231d629ce5f90;p=ceph.git

Merge remote-tracking branch 'gh/wip-6242-b' into next

Reviewed-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
---

dbbf9938e308c29633ade363ef5231d629ce5f90