]> 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: a9bb16b 73078cf)
Merge PR #33752 into master
authorSage Weil <sage@redhat.com>
Sat, 7 Mar 2020 14:25:22 +0000 (08:25 -0600)
committerSage Weil <sage@redhat.com>
Sat, 7 Mar 2020 14:25:22 +0000 (08:25 -0600)
commitf0cc50725f0358e03eeadd43a52c3cbea6d33bee
treebd40e4f8d9c451ea4b567fccb705dc919a7ee943tree | snapshot
parenta9bb16b40f45010c9a720f61b2efd56f93840af1commit | diff
parent73078cf73c3a51f33ecb97eebbb97dbcd4089171commit | diff
Merge PR #33752 into master

* refs/pull/33752/head:
mgr: update metadata if an osd just joins
mgr: update "hostname" when we already have the daemon state from the same entity

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Unnamed repository; edit this file 'description' to name the repository.