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

* 'release-1.7' of https://github.com/kubernetes/kubernetes.github.io:
  add doc for --as-group in cli

* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  cassandra.md: Fix Liquid syntax warning
This commit is contained in:
Andrew Chen
2017-06-29 16:03:38 -07:00
@@ -83,7 +83,7 @@ kubectl create -f cassandra/cassandra-statefulset.yaml
kubectl exec -ti cassandra-0 -- nodetool status
# cleanup
grace=$(kubectl get po cassandra-0 --template '{{.spec.terminationGracePeriodSeconds}}') \
grace=$(kubectl get po cassandra-0 -o=jsonpath='{.spec.terminationGracePeriodSeconds}') \
&& kubectl delete statefulset,po -l app=cassandra \
&& echo "Sleeping $grace" \
&& sleep $grace \
@@ -421,7 +421,7 @@ Deleting and/or scaling a StatefulSet down will not delete the volumes associate
Use the following commands to delete the StatefulSet.
```console
$ grace=$(kubectl get po cassandra-0 --template '{{.spec.terminationGracePeriodSeconds}}') \
$ grace=$(kubectl get po cassandra-0 -o=jsonpath='{.spec.terminationGracePeriodSeconds}') \
&& kubectl delete statefulset -l app=cassandra \
&& echo "Sleeping $grace" \
&& sleep $grace \