Merge "Fix dns problem on E/// pod"

author boucherv <valentin.boucher@orange.com>

Wed, 13 Jan 2016 14:41:23 +0000 (14:41 +0000)

committer Gerrit Code Review <gerrit@172.30.200.206>

Wed, 13 Jan 2016 14:41:23 +0000 (14:41 +0000)
author boucherv <valentin.boucher@orange.com>
Wed, 13 Jan 2016 14:41:23 +0000 (14:41 +0000)
committer Gerrit Code Review <gerrit@172.30.200.206>
Wed, 13 Jan 2016 14:41:23 +0000 (14:41 +0000)
diff --cc testcases/functest_utils.py
Simple merge
diff --cc testcases/vIMS/CI/vIMS.py
Simple merge
author	boucherv <valentin.boucher@orange.com>
	Wed, 13 Jan 2016 14:41:23 +0000 (14:41 +0000)
committer	Gerrit Code Review <gerrit@172.30.200.206>
	Wed, 13 Jan 2016 14:41:23 +0000 (14:41 +0000)
		1	2
testcases/functest_utils.py	patch \|	diff1 \|	diff2 \|	blob \| history
testcases/vIMS/CI/vIMS.py	patch \|	diff1 \|	diff2 \|	blob \| history