Merge "Added vPing2 using SCP and SSH instead of nova userdata"

author mei mei <meimei@huawei.com>

Wed, 20 Jan 2016 01:16:03 +0000 (01:16 +0000)

committer Gerrit Code Review <gerrit@172.30.200.206>

Wed, 20 Jan 2016 01:16:03 +0000 (01:16 +0000)
author mei mei <meimei@huawei.com>
Wed, 20 Jan 2016 01:16:03 +0000 (01:16 +0000)
committer Gerrit Code Review <gerrit@172.30.200.206>
Wed, 20 Jan 2016 01:16:03 +0000 (01:16 +0000)
diff --cc docker/run_tests.sh
Simple merge
diff --cc testcases/functest_utils.py
Simple merge
author	mei mei <meimei@huawei.com>
	Wed, 20 Jan 2016 01:16:03 +0000 (01:16 +0000)
committer	Gerrit Code Review <gerrit@172.30.200.206>
	Wed, 20 Jan 2016 01:16:03 +0000 (01:16 +0000)
		1	2
docker/run_tests.sh	patch \|	diff1 \|	diff2 \|	blob \| history
testcases/functest_utils.py	patch \|	diff1 \|	diff2 \|	blob \| history