diff options
author | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-04-12 19:34:01 +0000 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2017-04-13 20:00:14 +0800 |
commit | 2cd9c263602c1af79c7873a9f071e8699a084c53 (patch) | |
tree | 49e792954403cb1da0fbf1a555b80b2970b5a5da | |
parent | c9fb9572fc16f064a995d66e0bf5dcacc2a37f0d (diff) | |
download | gitlab-ce-2cd9c263602c1af79c7873a9f071e8699a084c53.tar.gz |
Merge branch 'patch-15' into 'master'
Add link to environments on kubernetes.md
See merge request !10555
-rw-r--r-- | doc/user/project/integrations/kubernetes.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/user/project/integrations/kubernetes.md b/doc/user/project/integrations/kubernetes.md index 2a890acde4d..f7d5e3a8ab2 100644 --- a/doc/user/project/integrations/kubernetes.md +++ b/doc/user/project/integrations/kubernetes.md @@ -60,7 +60,7 @@ to use terminals. Support is currently limited to the first container in the first pod of your environment. 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 containers. To use this integration, you should deploy to Kubernetes using the deployment variables above, ensuring any pods you create are labelled with |