From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 18 Jul 2013 04:08:23 +0000 (+0000)
Subject: Merge "rename quantum into neutron"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=1bd456371f9909d5cb33536e84a3fdd7aac40f8c;p=openstack-build%2Fneutron-build.git

Merge "rename quantum into neutron"
---

1bd456371f9909d5cb33536e84a3fdd7aac40f8c
diff --cc etc/neutron/plugins/ml2/ml2_conf.ini
index 4ad62e3ee,992744b3c..25022a486
--- a/etc/neutron/plugins/ml2/ml2_conf.ini
+++ b/etc/neutron/plugins/ml2/ml2_conf.ini
@@@ -1,10 -1,10 +1,10 @@@
  
  [ml2]
  # (ListOpt) List of network type driver entrypoints to be loaded from
- # the quantum.ml2.type_drivers namespace.
+ # the neutron.ml2.type_drivers namespace.
  #
 -# type_drivers = local,flat,vlan
 -# Example: type_drivers = flat,vlan,gre
 +# type_drivers = local,flat,vlan,gre,vxlan
 +# Example: type_drivers = flat,vlan,gre,vxlan
  
  # (ListOpt) Ordered list of network_types to allocate as tenant
  # networks. The default value 'local' is useful for single-box testing