]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #43172 into master
authorSage Weil <sage@newdream.net>
Thu, 16 Sep 2021 02:48:36 +0000 (22:48 -0400)
committerSage Weil <sage@newdream.net>
Thu, 16 Sep 2021 02:48:36 +0000 (22:48 -0400)
commit1a19d6967986ebe95574373a1d05abefd9afa633
tree2bedae7837e7aa69a34de5dc70f31a1d254a95cb
parent9051ad932322e8d009981c3f49bdf458814b5e9d
parent2a6ad93a76a50f91d6034852953b26725f71809c
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>