From: Josh Durgin Date: Wed, 23 Jul 2014 17:09:19 +0000 (-0700) Subject: Merge remote-tracking branch 'origin/wip-8858-firefly' into firefly X-Git-Tag: v0.80.5~5 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=42ad241efab751a1d4f50d5a748d91d0fe967844;p=ceph.git Merge remote-tracking branch 'origin/wip-8858-firefly' into firefly Reviewed-by: Josh Durgin --- 42ad241efab751a1d4f50d5a748d91d0fe967844