From: Sage Weil Date: Fri, 14 Mar 2014 18:42:30 +0000 (-0700) Subject: Merge remote-tracking branch 'gh/wip-da-SCA-firefly-20140304' X-Git-Tag: v0.79~151 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5873b0f03ce80c9b6bb0699590eaf36ec6761b75;p=ceph.git Merge remote-tracking branch 'gh/wip-da-SCA-firefly-20140304' Reviewed-by: Sage Weil --- 5873b0f03ce80c9b6bb0699590eaf36ec6761b75