Merge "ml2: gre, vxlan type driver can leak segment_id"

author Jenkins <jenkins@review.openstack.org>

Wed, 18 Dec 2013 17:04:29 +0000 (17:04 +0000)

committer Gerrit Code Review <review@openstack.org>

Wed, 18 Dec 2013 17:04:29 +0000 (17:04 +0000)
author Jenkins <jenkins@review.openstack.org>
Wed, 18 Dec 2013 17:04:29 +0000 (17:04 +0000)
committer Gerrit Code Review <review@openstack.org>
Wed, 18 Dec 2013 17:04:29 +0000 (17:04 +0000)
diff --cc neutron/plugins/ml2/drivers/type_gre.py
Simple merge
diff --cc neutron/plugins/ml2/drivers/type_vxlan.py
Simple merge
diff --cc neutron/tests/unit/ml2/test_type_vxlan.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Wed, 18 Dec 2013 17:04:29 +0000 (17:04 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Wed, 18 Dec 2013 17:04:29 +0000 (17:04 +0000)
		1	2
neutron/plugins/ml2/drivers/type_gre.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/plugins/ml2/drivers/type_vxlan.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/unit/ml2/test_type_vxlan.py	patch \|	diff1 \|	diff2 \|	blob \| history