tree cf4230788b39d02b2d7152663ad8b03c8438e66d
parent 5af6e47763b824165d3028bbfebaef551c6f8812
parent 9d1ec74e3b28404db4bc335525926e59e8bc1b4e
author Jon Hall <jhall@onlab.us> 1421708715 -0800
committer Jon Hall <jhall@onlab.us> 1421877580 -0800

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

Conflicts:
	TestON/drivers/common/cli/onosdriver.py
	TestON/drivers/common/clidriver.py