From: Sage Weil Date: Tue, 12 Aug 2014 21:38:33 +0000 (-0700) Subject: Merge remote-tracking branch 'gh/firefly-next' into firefly X-Git-Tag: v0.80.6~103 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dec028d113ab4bcc7106fea0bf413b54829f67e7;p=ceph.git Merge remote-tracking branch 'gh/firefly-next' into firefly --- dec028d113ab4bcc7106fea0bf413b54829f67e7