From: Sage Weil Date: Tue, 14 Oct 2014 21:57:42 +0000 (-0700) Subject: Merge remote-tracking branch 'gh/firefly' into firefly-next X-Git-Tag: v0.80.8~48 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=111eec9ff6325a12fcbf066ae08f27919aeae5d8;p=ceph.git Merge remote-tracking branch 'gh/firefly' into firefly-next --- 111eec9ff6325a12fcbf066ae08f27919aeae5d8