Merge "Enable most unit tests for py34 job"

author Jenkins <jenkins@review.openstack.org>

Fri, 4 Sep 2015 20:55:18 +0000 (20:55 +0000)

committer Gerrit Code Review <review@openstack.org>

Fri, 4 Sep 2015 20:55:18 +0000 (20:55 +0000)
author Jenkins <jenkins@review.openstack.org>
Fri, 4 Sep 2015 20:55:18 +0000 (20:55 +0000)
committer Gerrit Code Review <review@openstack.org>
Fri, 4 Sep 2015 20:55:18 +0000 (20:55 +0000)
diff --cc neutron/common/exceptions.py
Simple merge
diff --cc neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
Simple merge
diff --cc tox.ini
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Fri, 4 Sep 2015 20:55:18 +0000 (20:55 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Fri, 4 Sep 2015 20:55:18 +0000 (20:55 +0000)
		1	2
neutron/common/exceptions.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py	patch \|	diff1 \|	diff2 \|	blob \| history
tox.ini	patch \|	diff1 \|	diff2 \|	blob \| history