From: Samuel Just Date: Mon, 13 Oct 2014 17:34:47 +0000 (-0700) Subject: Merge remote-tracking branch 'origin/wip-7588-firefly' into firefly X-Git-Tag: v0.80.7~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fa599aad2d79e0bbc19e4f6a2ac6771b37bf6beb;p=ceph.git Merge remote-tracking branch 'origin/wip-7588-firefly' into firefly --- fa599aad2d79e0bbc19e4f6a2ac6771b37bf6beb