Merge branch 'patch-15' into 'master'

Add link to environments on kubernetes.md

See merge request !10555
This commit is contained in:
Achilleas Pipinellis 2017-04-12 19:34:01 +00:00
commit defdf45ab5

View file

@ -60,7 +60,7 @@ to use terminals. Support is currently limited to the first container in the
first pod of your environment. first pod of your environment.
When enabled, the Kubernetes service adds [web terminal](../../../ci/environments.md#web-terminals) When enabled, the Kubernetes service adds [web terminal](../../../ci/environments.md#web-terminals)
support to your environments. This is based on the `exec` functionality found in support to your [environments](../../../ci/environments.md). This is based on the `exec` functionality found in
Docker and Kubernetes, so you get a new shell session within your existing Docker and Kubernetes, so you get a new shell session within your existing
containers. To use this integration, you should deploy to Kubernetes using containers. To use this integration, you should deploy to Kubernetes using
the deployment variables above, ensuring any pods you create are labelled with the deployment variables above, ensuring any pods you create are labelled with