From 55c944b83b74f8496600da90886089d1ae0e3649 Mon Sep 17 00:00:00 2001 From: Naveen Date: Sun, 31 Jul 2016 09:13:03 -0400 Subject: [PATCH] Fixed the conflicts --- docs/user-guide/configmap/index.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/user-guide/configmap/index.md b/docs/user-guide/configmap/index.md index 110dfd7c97..59374851ac 100644 --- a/docs/user-guide/configmap/index.md +++ b/docs/user-guide/configmap/index.md @@ -1,4 +1,3 @@ - --- --- Many applications require configuration via some combination of config files, command line @@ -363,7 +362,7 @@ spec: containers: - name: test-container image: gcr.io/google_containers/busybox - command: ["/bin/sh","-c", "cat", "/etc/config/special.how" ] + command: [ "/bin/sh", "-c" , "cat /etc/config/special.how" ] volumeMounts: - name: config-volume mountPath: /etc/config @@ -391,7 +390,7 @@ spec: containers: - name: test-container image: gcr.io/google_containers/busybox - command: [ "/bin/sh", "-c", "cat", "/etc/config/path/to/special-key" ] + command: [ "/bin/sh", "-c" , "cat /etc/config/path/to/special-key" ] volumeMounts: - name: config-volume mountPath: /etc/config