Skip to content

G
gitlab-ce
Commit 55a6043b authored by Thong Kuah's avatar Thong Kuah
Browse files
Options

Fix conflict in clusters/index.md

parent 7122b936
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
doc/user/project/clusters/index.md
View file @ 55a6043b
...@@ -402,7 +402,6 @@ NOTE: **NOTE:** ...@@ -402,7 +402,6 @@ NOTE: **NOTE:**
Prior to GitLab 11.5, `KUBE_TOKEN` was the Kubernetes token of the main Prior to GitLab 11.5, `KUBE_TOKEN` was the Kubernetes token of the main
service account of the cluster integration. service account of the cluster integration.
<<<<<<< HEAD
## Monitoring your Kubernetes cluster **[ULTIMATE]** ## Monitoring your Kubernetes cluster **[ULTIMATE]**
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4701) in [GitLab Ultimate][ee] 10.6. > [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4701) in [GitLab Ultimate][ee] 10.6.
...@@ -411,8 +410,6 @@ When [Prometheus is deployed](#installing-applications), GitLab will automatical ...@@ -411,8 +410,6 @@ When [Prometheus is deployed](#installing-applications), GitLab will automatical
![Cluster Monitoring](img/k8s_cluster_monitoring.png) ![Cluster Monitoring](img/k8s_cluster_monitoring.png)
=======
>>>>>>> upstream/master
## Enabling or disabling the Kubernetes cluster integration ## Enabling or disabling the Kubernetes cluster integration
After you have successfully added your cluster information, you can enable the After you have successfully added your cluster information, you can enable the
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7