Merge "kubernetes_utils: avoid 404 error code in delete_service()"

author Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>

Mon, 23 Jul 2018 07:54:22 +0000 (07:54 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Mon, 23 Jul 2018 07:54:22 +0000 (07:54 +0000)
author Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
Mon, 23 Jul 2018 07:54:22 +0000 (07:54 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Mon, 23 Jul 2018 07:54:22 +0000 (07:54 +0000)
diff --cc yardstick/orchestrator/kubernetes.py
Simple merge
diff --cc yardstick/tests/unit/orchestrator/test_kubernetes.py
Simple merge
author	Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
	Mon, 23 Jul 2018 07:54:22 +0000 (07:54 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Mon, 23 Jul 2018 07:54:22 +0000 (07:54 +0000)
		1	2
yardstick/orchestrator/kubernetes.py	patch \|	diff1 \|	diff2 \|	blob \| history
yardstick/tests/unit/orchestrator/test_kubernetes.py	patch \|	diff1 \|	diff2 \|	blob \| history