]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #27563 into master
authorSage Weil <sage@redhat.com>
Tue, 16 Apr 2019 19:30:41 +0000 (14:30 -0500)
committerSage Weil <sage@redhat.com>
Tue, 16 Apr 2019 19:30:41 +0000 (14:30 -0500)
* refs/pull/27563/head:
mon/OSDMonitor: respect crush node flags for can_mark_*()
osd/OSDMap: add get_crush_node_flags(int osd)
mon/OSDMonitor: make 'osd {add,rm}-{noin,noout,...}' support crush nodes
osd/OSDMap: raise OSD_FLAGS health alert for crush node flags, too
osd/OSDMap: add flags for crush nodes

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
1  2 
src/mon/OSDMonitor.cc

Simple merge