From: Samuel Just Date: Thu, 30 Oct 2014 20:48:18 +0000 (-0700) Subject: Merge remote-tracking branch 'origin/wip-9574' into wip-sam-firefly-backports X-Git-Tag: v0.80.8~30^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8978c8dc1f153a9052b5d967ceff11d4f08d51ea;p=ceph.git Merge remote-tracking branch 'origin/wip-9574' into wip-sam-firefly-backports --- 8978c8dc1f153a9052b5d967ceff11d4f08d51ea