From: Sage Weil <sage@newdream.net>
Date: Fri, 19 Mar 2021 12:31:24 +0000 (-0400)
Subject: Merge PR #40223 into master
X-Git-Tag: v17.1.0~2556
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6b43b2bfe6e64fb175f225cf5e171aa2077aea1e;p=ceph.git

Merge PR #40223 into master

* refs/pull/40223/head:
	cephadm: prevent podman from breaking socket.getfqdn()

Reviewed-by: Daniel Pivonka <dpivonka@redhat.com>
---

6b43b2bfe6e64fb175f225cf5e171aa2077aea1e
diff --cc .githubmap
index 498beb8500b3,498beb8500b3..b7c9454ec1df
--- a/.githubmap
+++ b/.githubmap
@@@ -135,3 -135,3 +135,4 @@@ sunnyku Sunny Kumar <sunkumar@redhat.co
  adk3798 Adam King <adking@redhat.com>
  runsisi luo runbing <luo.runbing@zte.com.cn>
  xxhdx1985126 Xuehan Xu <xuxuehan@360.cn>
++Daniel-Pivonka Daniel Pivonka <dpivonka@redhat.com>