From: Samuel Just Date: Sat, 2 Aug 2014 18:28:14 +0000 (-0700) Subject: Merge remote-tracking branch 'origin/wip-8438' into firefly-next X-Git-Tag: v0.80.6~103^2~2^2~7 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d90148da293b4a3e2a44d4486a6b48e27d35b79b;p=ceph.git Merge remote-tracking branch 'origin/wip-8438' into firefly-next Backport of c5b8d8105d965da852c79add607b69d5ae79a4d4 --- d90148da293b4a3e2a44d4486a6b48e27d35b79b