]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ca140a5 79f0043)
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)
commit872590fe830a2082f0950a352384562050db93e6
treeafd878d0c223c6cc3171f2f79b657a1457158a3ftree | snapshot
parentca140a50010957c6b2aab21dabeb44783ace9fa6commit | diff
parent79f0043208f9ba2d4cf02877e6f349b8d0ce55dccommit | diff
Merge PR #27563 into master

* 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>
src/mon/OSDMonitor.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.