From: Sage Weil Date: Thu, 15 Nov 2012 17:48:25 +0000 (-0800) Subject: Merge remote-tracking branch 'gh/wip-3477' into next X-Git-Tag: v0.55~92 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0fb23cf8ced5bbd0d148302e2a09fc28c0cbf94c;p=ceph.git Merge remote-tracking branch 'gh/wip-3477' into next Reviewed-by: Greg Farnum --- 0fb23cf8ced5bbd0d148302e2a09fc28c0cbf94c