Merge "dovetail tool: reorganize statements in class DovetailConfig"

author hongbo tian <hongbo.tianhongbo@huawei.com>

Fri, 2 Dec 2016 17:43:00 +0000 (17:43 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Fri, 2 Dec 2016 17:43:00 +0000 (17:43 +0000)
author hongbo tian <hongbo.tianhongbo@huawei.com>
Fri, 2 Dec 2016 17:43:00 +0000 (17:43 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Fri, 2 Dec 2016 17:43:00 +0000 (17:43 +0000)
diff --cc dovetail/conf/dovetail_config.py
Simple merge
diff --cc dovetail/run.py
Simple merge
author	hongbo tian <hongbo.tianhongbo@huawei.com>
	Fri, 2 Dec 2016 17:43:00 +0000 (17:43 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Fri, 2 Dec 2016 17:43:00 +0000 (17:43 +0000)
		1	2
dovetail/conf/dovetail_config.py	patch \|	diff1 \|	diff2 \|	blob \| history
dovetail/run.py	patch \|	diff1 \|	diff2 \|	blob \| history