whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removing junk chars

Browse Source 
Removing junk chars
This commit is contained in:
Rajesh Deshpande
2020-03-27 12:25:05 +05:30
committed by GitHub
parent dfb8d40026
commit f3d82cf167
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/en/docs/tasks/manage-daemon/update-daemon-set.md
-4
View File
@@ -75,11 +75,7 @@ If you haven't created the DaemonSet in the system, check your DaemonSet
manifest with the following command instead: manifest with the following command instead:
```shell ```shell
<<<<<<< HEAD
kubectl apply -f https://k8s.io/examples/controllers/fluentd-daemonset.yaml --dry-run=client -o go-template='{{.spec.updateStrategy.type}}{{"\n"}}' kubectl apply -f https://k8s.io/examples/controllers/fluentd-daemonset.yaml --dry-run=client -o go-template='{{.spec.updateStrategy.type}}{{"\n"}}'
=======
kubectl apply -f https://k8s.io/examples/controllers/fluentd-daemonset.yaml --dry-run -o go-template='{{.spec.updateStrategy.type}}{{"\n"}}'
>>>>>>> Adding example for DaemonSet Rolling Update task
``` ```
The output from both commands should be: The output from both commands should be: