resolving conflicts

2020-07-19 19:15:36 -04:00
parent a25db870c3 c477e089b7
commit 53f2d23359
255 changed files with 7212 additions and 4368 deletions
@@ -302,7 +302,7 @@ kubectl-user delete pod pause
 Let's try that again, slightly differently:

 ```shell
-kubectl-user run pause --image=k8s.gcr.io/pause
+kubectl-user create deployment pause --image=k8s.gcr.io/pause
 deployment "pause" created

 kubectl-user get pods