]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* 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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.