]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #40223 into master
authorSage Weil <sage@newdream.net>
Fri, 19 Mar 2021 12:31:24 +0000 (08:31 -0400)
committerSage Weil <sage@newdream.net>
Fri, 19 Mar 2021 12:31:24 +0000 (08:31 -0400)
* refs/pull/40223/head:
cephadm: prevent podman from breaking socket.getfqdn()

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

diff --cc .githubmap
index 498beb8500b39bb92b991b286c7467c612deae3f,498beb8500b39bb92b991b286c7467c612deae3f..b7c9454ec1dfd8d7910faddd41ae82f262ad2aac
@@@ -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>