Merge "Reverted the file permission"

author Helen Yao <yaohelan@huawei.com>

Sun, 22 Jan 2017 02:39:53 +0000 (02:39 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Sun, 22 Jan 2017 02:39:53 +0000 (02:39 +0000)
author Helen Yao <yaohelan@huawei.com>
Sun, 22 Jan 2017 02:39:53 +0000 (02:39 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Sun, 22 Jan 2017 02:39:53 +0000 (02:39 +0000)
diff --cc functest/opnfv_tests/openstack/vping/vping_base.py

index 8285d93,e467dd9..8285d93

mode 100755,100644..100644
--- 1/functest/opnfv_tests/openstack/vping/vping_base.py
--- 2/functest/opnfv_tests/openstack/vping/vping_base.py
+++ b/functest/opnfv_tests/openstack/vping/vping_base.py
diff --cc test-requirements.txt

index 2bf297b,8be8e20..2bf297b

mode 100755,100644..100644
--- 1/test-requirements.txt
--- 2/test-requirements.txt
+++ b/test-requirements.txt
author	Helen Yao <yaohelan@huawei.com>
	Sun, 22 Jan 2017 02:39:53 +0000 (02:39 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Sun, 22 Jan 2017 02:39:53 +0000 (02:39 +0000)
		1	2
functest/opnfv_tests/openstack/vping/vping_base.py	patch \|	diff1 \|	diff2 \|	blob \| history
test-requirements.txt	patch \|	diff1 \|	diff2 \|	blob \| history