Merge "Wrong usage of "a""

author Jenkins <jenkins@review.openstack.org>

Wed, 30 Dec 2015 20:15:01 +0000 (20:15 +0000)

committer Gerrit Code Review <review@openstack.org>

Wed, 30 Dec 2015 20:15:01 +0000 (20:15 +0000)
author Jenkins <jenkins@review.openstack.org>
Wed, 30 Dec 2015 20:15:01 +0000 (20:15 +0000)
committer Gerrit Code Review <review@openstack.org>
Wed, 30 Dec 2015 20:15:01 +0000 (20:15 +0000)
diff --cc neutron/api/v2/attributes.py
Simple merge
diff --cc neutron/db/address_scope_db.py
Simple merge
diff --cc neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Wed, 30 Dec 2015 20:15:01 +0000 (20:15 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Wed, 30 Dec 2015 20:15:01 +0000 (20:15 +0000)
		1	2
neutron/api/v2/attributes.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/db/address_scope_db.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py	patch \|	diff1 \|	diff2 \|	blob \| history