]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commit9ef77430f3d46789b0ba1a2afa42729627734500
tree31501c79433770207e65e1923a3edc3b7d41f768
parent1205867d3afe6d457483f9f51aaee79cca74e040
parentb668566fd8148414b8074f096b85b22c42ed3af9
Merge pull request #3684 from ceph/wip-crush-straw-firefly

osd: backport straw bucket fixes and all other recent crush goodness to firefly

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