]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #3684 from ceph/wip-crush-straw-firefly
authorLoic Dachary <ldachary@redhat.com>
Fri, 13 Feb 2015 17:34:11 +0000 (18:34 +0100)
committerLoic Dachary <ldachary@redhat.com>
Fri, 13 Feb 2015 17:34:11 +0000 (18:34 +0100)
osd: backport straw bucket fixes and all other recent crush goodness to firefly

Reviewed-by: Loic Dachary <ldachary@redhat.com>

Trivial merge