Merge "Adding breaktrace & disabling timer migration"

author Jiang, Yunhong <yunhong.jiang@intel.com>

Tue, 16 May 2017 20:34:40 +0000 (20:34 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Tue, 16 May 2017 20:34:40 +0000 (20:34 +0000)
author Jiang, Yunhong <yunhong.jiang@intel.com>
Tue, 16 May 2017 20:34:40 +0000 (20:34 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Tue, 16 May 2017 20:34:40 +0000 (20:34 +0000)
diff --cc tests/kvmfornfv_cyclictest_hostenv_guestenv.yaml
Simple merge
author	Jiang, Yunhong <yunhong.jiang@intel.com>
	Tue, 16 May 2017 20:34:40 +0000 (20:34 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Tue, 16 May 2017 20:34:40 +0000 (20:34 +0000)