]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #2643 from johnugeorge/wip-9492-crush-firefly
authorLoic Dachary <loic-201408@dachary.org>
Mon, 6 Oct 2014 07:50:33 +0000 (09:50 +0200)
committerLoic Dachary <loic-201408@dachary.org>
Mon, 6 Oct 2014 07:50:33 +0000 (09:50 +0200)
Crush: Backporting fixes for #9492 to firefly

Reviewed-by: Loic Dachary <loic-201408@dachary.org>

Trivial merge