]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #39739 into master
authorSage Weil <sage@newdream.net>
Tue, 2 Mar 2021 16:32:12 +0000 (11:32 -0500)
committerSage Weil <sage@newdream.net>
Tue, 2 Mar 2021 16:32:12 +0000 (11:32 -0500)
* 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>
1  2 
src/cephadm/cephadm
src/pybind/mgr/cephadm/module.py

Simple merge
Simple merge