From: Sage Weil <sage@redhat.com>
Date: Tue, 29 Oct 2019 18:39:40 +0000 (-0500)
Subject: Merge PR #31181 into master
X-Git-Tag: v15.1.0~1120
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3c0df4489c9c85f4b12e6b493275db9089f0a5d6;p=ceph.git

Merge PR #31181 into master

* refs/pull/31181/head:
	ceph-daemon: only pass podman -it if need an interactive shell

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

3c0df4489c9c85f4b12e6b493275db9089f0a5d6
diff --cc .githubmap
index 73322d385cd2,73322d385cd2..dc85b6ebff3e
--- a/.githubmap
+++ b/.githubmap
@@@ -104,3 -104,3 +104,4 @@@ travisn Travis Nielsen <tnielsen@redhat
  sidharthanup Sidharth Anupkrishnan <sanupkri@redhat.com>
  varshar16 Varsha Rao <varao@redhat.com>
  guits Guillaume Abrioux <gabrioux@redhat.com>
++mgfritch Michael Fritch <mfritch@suse.com>