]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #15002 from dachary/wip-19836-crush-pre-luminous
authorSage Weil <sage@newdream.net>
Wed, 17 May 2017 15:26:06 +0000 (10:26 -0500)
committerGitHub <noreply@github.com>
Wed, 17 May 2017 15:26:06 +0000 (10:26 -0500)
commit81bd3025d113236ba0bfbbc6f188024756587d6b
tree754649bfc2d53beb9a30d784e86b6e77a8b78621
parent9a06fdbffe9f6c2ee4292df56140716c939cb111
parent7114581aaa057b1ccba21d96f30166f536275222
Merge pull request #15002 from dachary/wip-19836-crush-pre-luminous

crush: encode can override weights with weight set

Reviewed-by: Sage Weil <sage@redhat.com>
src/crush/CrushWrapper.cc
src/crush/CrushWrapper.h
src/osd/OSDMap.cc
src/test/crush/CrushWrapper.cc