From: Sage Weil <sage@newdream.net>
Date: Wed, 30 May 2012 17:05:01 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/wip-2349'
X-Git-Tag: v0.48argonaut~155^2~19
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e9588f0c82625dc957e024c68e8ccfc9b300e224;p=ceph.git

Merge remote-tracking branch 'gh/wip-2349'

Reviewed-by: Sage Weil <sage@newdream.net>
---

e9588f0c82625dc957e024c68e8ccfc9b300e224