tree 9c5a81638e3ae8718f4b03835cf83488adea6762
parent 22c3d41e103580402fbc6ee5d8b2356fc2798c36
parent 1c7509b87a65d457eaf41f5551e560f1aa2ea0df
author Hari Krishna <hari@onlab.us> 1424220977 -0800
committer Hari Krishna <hari@onlab.us> 1424220977 -0800

Merge branch 'OnosCHO' of https://github.com/OPENNETWORKINGLAB/ONLabTest into OnosCHO

Conflicts:
	TestON/drivers/common/cli/onosclidriver.py
	TestON/tests/OnosCHO/OnosCHO.params
	TestON/tests/OnosCHO/OnosCHO.py