Merge "Add flake8 and yamllint tox environments and fix tox errors"

author Nikos Karandreas <nick@intracom-telecom.com>

Thu, 18 Oct 2018 09:49:17 +0000 (09:49 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Thu, 18 Oct 2018 09:49:17 +0000 (09:49 +0000)
author Nikos Karandreas <nick@intracom-telecom.com>
Thu, 18 Oct 2018 09:49:17 +0000 (09:49 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Thu, 18 Oct 2018 09:49:17 +0000 (09:49 +0000)
diff --cc sdnvpn/lib/openstack_utils.py
Simple merge
diff --cc sdnvpn/test/functest/config.yaml
Simple merge
author	Nikos Karandreas <nick@intracom-telecom.com>
	Thu, 18 Oct 2018 09:49:17 +0000 (09:49 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Thu, 18 Oct 2018 09:49:17 +0000 (09:49 +0000)
		1	2
sdnvpn/lib/openstack_utils.py	patch \|	diff1 \|	diff2 \|	blob \| history
sdnvpn/test/functest/config.yaml	patch \|	diff1 \|	diff2 \|	blob \| history