tree 81fd354a8d423d1e81ba58baa0a7c00d78ce683f
parent efbd9791182966ff9a457b953c3e6fad2a2be770
parent 3db6ff93111b99651e550312a63def96a50d60a4
author Jon Hall <jhall@onlab.us> 1425664475 -0800
committer Jon Hall <jhall@onlab.us> 1425664475 -0800

Merge branch 'HA' of https://github.com/opennetworkinglab/ONLabTest into devl/merge

Conflicts:
	TestON/core/teston.py
	TestON/drivers/common/cli/emulator/mininetclidriver.py
	TestON/drivers/common/cli/onosdriver.py
	TestON/tests/HATestMinorityRestart/HATestMinorityRestart.py
	TestON/tests/HATestSingleInstanceRestart/HATestSingleInstanceRestart.py