tree 539190ff7616f6ba57c1bccd371e5d42749ce8e1
parent e3f39ff28b90b25484345c6cf2c0c6067ce2c42f
parent 8ec71447cf6f890345b6b3c29368d5bd3c29dd54
author kelvin <kelvin@onlab.us> 1421372207 -0800
committer Hari Krishna <hari@onlab.us> 1421372207 -0800

Merge branch 'devl/cleanup' of https://github.com/OPENNETWORKINGLAB/ONLabTest into remotes/origin/devl/cleanup

Conflicts:
	TestON/drivers/common/cli/onosclidriver.py