From: Josh Durgin Date: Fri, 21 Feb 2014 21:07:34 +0000 (-0800) Subject: Merge remote-tracking branch 'origin/wip-6951' into firefly X-Git-Tag: v0.78~145 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a19b460adec7b32698acff2d7d7887f24fa42868;p=ceph.git Merge remote-tracking branch 'origin/wip-6951' into firefly Reviewed-by: Josh Durgin --- a19b460adec7b32698acff2d7d7887f24fa42868