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