Merge "Remove network_services.vnf_generic.vnf.prox_helpers.ProxSocketHelper.rx_stats"

author Ross Brattain <ross.b.brattain@intel.com>

Fri, 10 Nov 2017 15:09:57 +0000 (15:09 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Fri, 10 Nov 2017 15:09:57 +0000 (15:09 +0000)
author Ross Brattain <ross.b.brattain@intel.com>
Fri, 10 Nov 2017 15:09:57 +0000 (15:09 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Fri, 10 Nov 2017 15:09:57 +0000 (15:09 +0000)
diff --cc tests/unit/network_services/vnf_generic/vnf/test_prox_helpers.py
Simple merge
diff --cc yardstick/network_services/vnf_generic/vnf/prox_helpers.py
Simple merge
author	Ross Brattain <ross.b.brattain@intel.com>
	Fri, 10 Nov 2017 15:09:57 +0000 (15:09 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Fri, 10 Nov 2017 15:09:57 +0000 (15:09 +0000)
		1	2
tests/unit/network_services/vnf_generic/vnf/test_prox_helpers.py	patch \|	diff1 \|	diff2 \|	blob \| history
yardstick/network_services/vnf_generic/vnf/prox_helpers.py	patch \|	diff1 \|	diff2 \|	blob \| history