]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #52292 into main
authorPatrick Donnelly <pdonnell@redhat.com>
Mon, 28 Aug 2023 13:26:17 +0000 (09:26 -0400)
committerPatrick Donnelly <pdonnell@redhat.com>
Mon, 28 Aug 2023 13:26:17 +0000 (09:26 -0400)
* refs/pull/52292/head:
mgr: register OSDs in ms_handle_accept
msg: indicate ms_handle_authentication is fast

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
1  2 
src/mds/MDSDaemon.cc
src/mon/MonClient.cc
src/mon/Monitor.cc
src/osd/OSD.cc
src/osd/OSD.h

Simple merge
Simple merge
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge