Merge "Add partial specs support in ML2 for vlan provider networks"

diff --cc neutron/plugins/ml2/driver_api.py
Simple merge

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/plugins/ml2/managers.py
Simple merge

diff --cc neutron/plugins/ml2/plugin.py
Simple merge