From: Sage Weil <sage@redhat.com>
Date: Sat, 7 Mar 2020 14:25:22 +0000 (-0600)
Subject: Merge PR #33752 into master
X-Git-Tag: v15.1.1~77
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f0cc50725f0358e03eeadd43a52c3cbea6d33bee;p=ceph.git

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>
---

f0cc50725f0358e03eeadd43a52c3cbea6d33bee