From: Sage Weil <sage@newdream.net>
Date: Thu, 16 Sep 2021 02:48:36 +0000 (-0400)
Subject: Merge PR #43172 into master
X-Git-Tag: v17.1.0~870
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1a19d6967986ebe95574373a1d05abefd9afa633;p=ceph.git

Merge PR #43172 into master

* refs/pull/43172/head:
	qa/tasks/kubeadm: modify (do not clobber) daemon.json

Reviewed-by: Joseph Sawaya <jsawaya@redhat.com>
---

1a19d6967986ebe95574373a1d05abefd9afa633