summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2017-10-03 08:57:12 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2017-10-03 08:57:12 +0000
commitb8e47d72637167be5a225fe20b5f893c43b9a885 (patch)
treea86d35c1584fc415a64d993f70dbbe6d21dd7fef /changelogs
parenteddeeed3c056b0d6ea4bf9a5774b713ef730fd11 (diff)
parent40c6128b398f62188e794fe97b4cb545b482e3da (diff)
downloadgitlab-ce-b8e47d72637167be5a225fe20b5f893c43b9a885.tar.gz
Merge branch 'fix-kubectl-180' into 'master'
Fix broken certificate-authority-data with kubectl >= 1.8.0 Closes #38685 See merge request gitlab-org/gitlab-ce!14635
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/fix-kubectl-180.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/fix-kubectl-180.yml b/changelogs/unreleased/fix-kubectl-180.yml
new file mode 100644
index 00000000000..beb71cecd57
--- /dev/null
+++ b/changelogs/unreleased/fix-kubectl-180.yml
@@ -0,0 +1,5 @@
+---
+title: 'Kubernetes integration: ensure v1.8.0 compatibility'
+merge_request: 14635
+author:
+type: fixed