From: Samuel Just Date: Sun, 21 Sep 2014 17:04:30 +0000 (-0700) Subject: Merge remote-tracking branch 'origin/wip-9240' into wip-sam-testing-firefly X-Git-Tag: v0.80.6~4^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=80f2f9cf687e25d6f2c4cee34fef55215ac6b027;p=ceph.git Merge remote-tracking branch 'origin/wip-9240' into wip-sam-testing-firefly --- 80f2f9cf687e25d6f2c4cee34fef55215ac6b027