]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aa5bd55 7aba184)
Merge PR #39631 into master
authorSage Weil <sage@newdream.net>
Mon, 1 Mar 2021 00:00:29 +0000 (19:00 -0500)
committerSage Weil <sage@newdream.net>
Mon, 1 Mar 2021 00:00:29 +0000 (19:00 -0500)
* refs/pull/39631/head:
osd/OSDMap: don't warn on NEW osd ids
mon/OSDMonitor: behave if inc map sets weight on not-yet-existing OSD
mon/OSDMonitor: do not mark newly created OSDs OUT

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1  2 
src/mon/OSDMonitor.cc patch | diff1 | diff2 | blob | history

diff --cc src/mon/OSDMonitor.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.