]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #15533 from liewegas/wip-crush-version
authorSage Weil <sage@newdream.net>
Mon, 19 Jun 2017 23:06:07 +0000 (18:06 -0500)
committerGitHub <noreply@github.com>
Mon, 19 Jun 2017 23:06:07 +0000 (18:06 -0500)
mon,osd: add crush_version to OSDMap, and allow crush map updates to gate on crush_version

Reviewed-by: Loic Dachary <loic@dachary.org>
1  2 
qa/workunits/cephtool/test.sh
src/mon/MonCommands.h
src/mon/OSDMonitor.cc
src/osd/OSDMap.cc
src/osd/OSDMap.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge