]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9051ad9 2a6ad93)
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)
* refs/pull/43172/head:
qa/tasks/kubeadm: modify (do not clobber) daemon.json

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.