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

Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.7

Browse Source 
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  Fix sentence
  Minor grammatical correction
  Remove beta as K8s support on Bluemix Container Service is live
  Fix some output
  replace REASON with STATUS
  column IP is missed
  replace kubectl.sh with kubectl
  replace KUBECTL with kubectl
  fix the command output
  fix the command output
  fix the command output
  Correcting the typo in init-container's name
  fix typo
  fix typo
  fix typo
  fix typo
  fix typo
  Update pod-overview.md (#3881)
  apps/v1beta1 is not valid (#3814)
  Get access to search console. (#3901)
This commit is contained in:
Andrew Chen
2017-05-26 13:39:26 -07:00
parent 64a7d876f0 fd4ce1860a
commit 0702830cde
20 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/concepts/workloads/controllers/deployment.md
+2 -2
View File
@@ -526,7 +526,7 @@ Eventually, resume the Deployment and observe a new ReplicaSet coming up with al
```shell
$ kubectl rollout resume deploy nginx
deployment "nginx" resumed
$ KUBECTL get rs -w
$ kubectl get rs -w
NAME DESIRED CURRENT READY AGE
nginx-2142116321 2 2 2 2m
nginx-3926361531 2 2 0 6s
@@ -543,7 +543,7 @@ nginx-2142116321 0 1 1 2m
nginx-2142116321 0 0 0 2m
nginx-3926361531 3 3 3 20s
^C
$ KUBECTL get rs
$ kubectl get rs
NAME DESIRED CURRENT READY AGE
nginx-2142116321 0 0 0 2m
nginx-3926361531 3 3 3 28s