From: Sage Weil Date: Thu, 3 Jan 2013 20:53:07 +0000 (-0800) Subject: Merge remote-tracking branch 'gh/wip-3714-b' into next X-Git-Tag: v0.57~242^2~5 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7e94f6f1a7b7a865433edacd6a521f6ea1170eac;p=ceph.git Merge remote-tracking branch 'gh/wip-3714-b' into next Signed-off-by: Samuel Just --- 7e94f6f1a7b7a865433edacd6a521f6ea1170eac