Merge "Support for extensions in ML2"

diff --cc etc/neutron/plugins/ml2/ml2_conf.ini
index 15281f15201726bc74e6110d8a53a50dfeeadca0,6325e714eee450c342079232aa2b75d6456c2036..f4c1d188772d2320f00a6a1da784b3b0bd71b10f
--- 1/etc/neutron/plugins/ml2/ml2_conf.ini
--- 2/etc/neutron/plugins/ml2/ml2_conf.ini
+++ b/etc/neutron/plugins/ml2/ml2_conf.ini
@@@ -20,8 -20,12 +20,13 @@@
  # Example: mechanism_drivers = cisco,logger
  # Example: mechanism_drivers = openvswitch,brocade
  # Example: mechanism_drivers = linuxbridge,brocade
 +# Example: mechanism_drivers = openvswitch,cisco_dfa
  
+ # (ListOpt) Ordered list of extension driver entrypoints
+ # to be loaded from the neutron.ml2.extension_drivers namespace.
+ # extension_drivers =
+ # Example: extension_drivers = anewextensiondriver
+ 
  [ml2_type_flat]
  # (ListOpt) List of physical_network names with which flat networks
  # can be created. Use * to allow flat networks with arbitrary

diff --cc setup.cfg
Simple merge