]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
crush/CrushWrapper: encode with features
authorSage Weil <sage@redhat.com>
Mon, 28 Nov 2016 19:35:53 +0000 (14:35 -0500)
committerSage Weil <sage@redhat.com>
Mon, 28 Nov 2016 19:35:53 +0000 (14:35 -0500)
commitbf96b30eaf552148249953ed4fb654cbb101c3d0
tree4afb59f498b5f90e65284d66d4e812c2c5e156ab
parentc5f5b94fc2e18b38d05f00fec04d2d7e3c35c54c
crush/CrushWrapper: encode with features

No behavior change yet; just fixing callers.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit b7c9e055848c8aa951bc48c957cff3ef323ea441)

[Updated write_file to use all feaetures]
[Updated OSDMonitor.cc to use mon->quorum_features instead of the
 mon->get_quorum_con_featuers() helper]
[trivial conflict from removed write_file and read_file]

Conflicts:
src/crush/CrushWrapper.h
src/mgr/PyModules.cc
src/mon/OSDMonitor.cc
src/tools/ceph_monstore_tool.cc
src/crush/CrushTester.cc
src/crush/CrushWrapper.cc
src/crush/CrushWrapper.h
src/mon/OSDMonitor.cc
src/osd/OSDMap.cc
src/test/encoding/types.h
src/tools/ceph_monstore_tool.cc
src/tools/crushtool.cc
src/tools/osdmaptool.cc