From: Sage Weil <sage@newdream.net>
Date: Tue, 2 Mar 2021 16:32:12 +0000 (-0500)
Subject: Merge PR #39739 into master
X-Git-Tag: v17.1.0~2781
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=65724b1f97a00ee345db806ebbef3fad5be74dab;p=ceph.git

Merge PR #39739 into master

* refs/pull/39739/head:
	cephadm: set CEPH_USE_RANDOM_NONCE if using --init
	msg/Messenger: use random nonce if CEPH_USE_RANDOM_NONCE or pid == 1
	Revert "Merge PR #39482 into master"

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
---

65724b1f97a00ee345db806ebbef3fad5be74dab