Merge "update vesk8 input template and version"

author Mandeep Khinda <Mandeep.Khinda@amdocs.com>

Wed, 29 Aug 2018 17:45:28 +0000 (17:45 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Wed, 29 Aug 2018 17:45:28 +0000 (17:45 +0000)
author Mandeep Khinda <Mandeep.Khinda@amdocs.com>
Wed, 29 Aug 2018 17:45:28 +0000 (17:45 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Wed, 29 Aug 2018 17:45:28 +0000 (17:45 +0000)
diff --cc kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-ves-inputs.yaml
Simple merge
diff --cc kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml
Simple merge
author	Mandeep Khinda <Mandeep.Khinda@amdocs.com>
	Wed, 29 Aug 2018 17:45:28 +0000 (17:45 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Wed, 29 Aug 2018 17:45:28 +0000 (17:45 +0000)
		1	2
kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-ves-inputs.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml	patch \|	diff1 \|	diff2 \|	blob \| history