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