From: Sage Weil Date: Sat, 9 Aug 2014 02:05:37 +0000 (-0700) Subject: Merge remote-tracking branch 'gh/firefly-next' into firefly X-Git-Tag: v0.80.6~103^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=22aa81413e7db43418e613aea037e978031f5b8a;p=ceph.git Merge remote-tracking branch 'gh/firefly-next' into firefly --- 22aa81413e7db43418e613aea037e978031f5b8a