Merge branch 'master' into branch3

reviewable/pr2011/r1
Jared 2016-12-21 12:58:10 -08:00 committed by GitHub
commit 8b675f508a
1 changed files with 1 additions and 1 deletions

View File

@ -69,7 +69,7 @@ kubectl get [(-o|--output=)json|yaml|wide|custom-columns=...|custom-columns-file
kubectl get -f pod.yaml -o json
# Return only the phase value of the specified pod.
kubectl get -o template pod/web-pod-13je7 --template={% raw %}{{.status.phase}}{% endraw %}
kubectl get -o template pod/web-pod-13je7 --template={{.status.phase}}
# List all replication controllers and services together in ps output format.
kubectl get rc,services