From: Sage Weil Date: Fri, 9 Aug 2013 16:41:41 +0000 (-0700) Subject: Merge remote-tracking branch 'gh/wip-5648-c' X-Git-Tag: v0.68~96 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d5aa3a90a5888385caab88d8648c1defa1345633;p=ceph.git Merge remote-tracking branch 'gh/wip-5648-c' Reviewed-by: Sage Weil --- d5aa3a90a5888385caab88d8648c1defa1345633