Merge "Remove get_namespace from API extensions"

diff --cc neutron/api/extensions.py
index fe6ea333c414b5da0344c916a048cdd0a3a57e9a,396dc817cb75ecce29f2c56e5429544324b147d4..01bdf45129ffb8146ff889fde27c8b777f62b68e
--- 1/neutron/api/extensions.py
--- 2/neutron/api/extensions.py
+++ b/neutron/api/extensions.py
@@@ -500,11 -483,9 +480,10 @@@ class ExtensionManager(object)
              LOG.debug('Ext name: %s', extension.get_name())
              LOG.debug('Ext alias: %s', extension.get_alias())
              LOG.debug('Ext description: %s', extension.get_description())
-             LOG.debug('Ext namespace: %s', extension.get_namespace())
              LOG.debug('Ext updated: %s', extension.get_updated())
          except AttributeError as ex:
 -            LOG.exception(_LE("Exception loading extension: %s"), unicode(ex))
 +            LOG.exception(_LE("Exception loading extension: %s"),
 +                          six.text_type(ex))
              return False
          return True
  

diff --cc neutron/extensions/agent.py
Simple merge

diff --cc neutron/extensions/allowedaddresspairs.py
Simple merge

diff --cc neutron/extensions/dvr.py
Simple merge

diff --cc neutron/extensions/extraroute.py
Simple merge

diff --cc neutron/extensions/metering.py
Simple merge

diff --cc neutron/extensions/portsecurity.py
Simple merge

diff --cc neutron/extensions/quotasv2.py
Simple merge

diff --cc neutron/extensions/routerservicetype.py
Simple merge

diff --cc neutron/extensions/securitygroup.py
Simple merge

diff --cc neutron/extensions/vlantransparent.py
Simple merge

diff --cc neutron/plugins/nec/extensions/router_provider.py
Simple merge

diff --cc neutron/plugins/vmware/extensions/advancedserviceproviders.py
Simple merge

diff --cc neutron/plugins/vmware/extensions/lsn.py
Simple merge

diff --cc neutron/plugins/vmware/extensions/maclearning.py
Simple merge

diff --cc neutron/plugins/vmware/extensions/networkgw.py
Simple merge

diff --cc neutron/plugins/vmware/extensions/qos.py
Simple merge

diff --cc neutron/plugins/vmware/extensions/routertype.py
Simple merge

diff --cc neutron/plugins/vmware/extensions/vnicindex.py
Simple merge

diff --cc neutron/tests/unit/dummy_plugin.py
Simple merge