From: Deepak Kataria <dd7022@att.com>
Date: Fri, 4 Oct 2019 13:19:59 +0000 (+0000)
Subject: Merge "[UI] Optional trust of all SSL Certificates"
X-Git-Tag: 2.0.0~21
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=validation.git;a=commitdiff_plain;h=a17bf435bc8e9e4d2aad3a165a779359c6f28908;hp=291b699220dc09c94211a56575b92e71056f261c

Merge "[UI] Optional trust of all SSL Certificates"
---

diff --git a/docker/kube-conformance/Makefile b/docker/kube-conformance/Makefile
index ee7b40f..8e76e14 100644
--- a/docker/kube-conformance/Makefile
+++ b/docker/kube-conformance/Makefile
@@ -15,7 +15,7 @@
 ##############################################################################
 
 export WORK_DIR?=$(TAG_PRE)
-export KUBE_VERSION=1.16
+export KUBE_VERSION=1.15
 export TAG_VER?=v$(KUBE_VERSION)
 
 .PHONY: .build