Merge "python: Pylint 1.8.2 code conformity"

author Martin Klozik <martinx.klozik@intel.com>

Tue, 3 Apr 2018 07:19:16 +0000 (07:19 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Tue, 3 Apr 2018 07:19:16 +0000 (07:19 +0000)
author Martin Klozik <martinx.klozik@intel.com>
Tue, 3 Apr 2018 07:19:16 +0000 (07:19 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Tue, 3 Apr 2018 07:19:16 +0000 (07:19 +0000)
diff --cc src/ovs/ofctl.py
Simple merge
diff --cc tools/pkt_gen/xena/xena.py
Simple merge
author	Martin Klozik <martinx.klozik@intel.com>
	Tue, 3 Apr 2018 07:19:16 +0000 (07:19 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Tue, 3 Apr 2018 07:19:16 +0000 (07:19 +0000)
		1	2
src/ovs/ofctl.py	patch \|	diff1 \|	diff2 \|	blob \| history
tools/pkt_gen/xena/xena.py	patch \|	diff1 \|	diff2 \|	blob \| history