From: Sage Weil Date: Wed, 12 Jun 2013 20:31:22 +0000 (-0700) Subject: Merge remote-tracking branch 'gh/wip_5238' X-Git-Tag: v0.65~100 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b284e25fe724e17d97ea8d2a42be6a29c9aeb3b4;p=ceph.git Merge remote-tracking branch 'gh/wip_5238' Reviewed-by: Sage Weil --- b284e25fe724e17d97ea8d2a42be6a29c9aeb3b4