Merge "Change k8s version from 1.9.1 to 1.10.4"

author HU Xinhui <xinhui_hu@foxmail.com>

Mon, 15 Oct 2018 12:46:15 +0000 (12:46 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Mon, 15 Oct 2018 12:46:15 +0000 (12:46 +0000)
author HU Xinhui <xinhui_hu@foxmail.com>
Mon, 15 Oct 2018 12:46:15 +0000 (12:46 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Mon, 15 Oct 2018 12:46:15 +0000 (12:46 +0000)
diff --cc build/build.yaml
Simple merge
diff --cc deploy/adapters/ansible/kubernetes/roles/kargo/tasks/main.yml
Simple merge
author	HU Xinhui <xinhui_hu@foxmail.com>
	Mon, 15 Oct 2018 12:46:15 +0000 (12:46 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Mon, 15 Oct 2018 12:46:15 +0000 (12:46 +0000)
		1	2
build/build.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
deploy/adapters/ansible/kubernetes/roles/kargo/tasks/main.yml	patch \|	diff1 \|	diff2 \|	blob \| history