Merge "Bugfix:Added the adapter info for compass and joid"
authorJose Lausuch <jose.lausuch@ericsson.com>
Sat, 25 Feb 2017 19:01:00 +0000 (19:01 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Sat, 25 Feb 2017 19:01:00 +0000 (19:01 +0000)
1  2 
functest/ci/prepare_env.py
functest/utils/functest_utils.py

Simple merge
Simple merge