]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #20875 from jan--f/mgr-server-list-hostname
authorJohn Spray <jspray@redhat.com>
Tue, 24 Apr 2018 11:36:48 +0000 (12:36 +0100)
committerGitHub <noreply@github.com>
Tue, 24 Apr 2018 11:36:48 +0000 (12:36 +0100)
mgr: add mgr daemon to DaemonStateIndex with metadata (hostname)

Reviewed-by: John Spray <john.spray@redhat.com>
1  2 
src/mgr/DaemonServer.cc
src/mgr/Mgr.cc
src/mgr/Mgr.h

Simple merge
diff --cc src/mgr/Mgr.cc
Simple merge
diff --cc src/mgr/Mgr.h
Simple merge