From: Samuel Just Date: Thu, 6 Nov 2014 18:37:42 +0000 (-0800) Subject: Merge remote-tracking branch 'origin/wip-sam-firefly-backports' into firefly X-Git-Tag: v0.80.8~30 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d241aa7a347655242cc71b8fa3d778df6948c494;p=ceph.git Merge remote-tracking branch 'origin/wip-sam-firefly-backports' into firefly --- d241aa7a347655242cc71b8fa3d778df6948c494