From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 17 Jul 2014 10:41:14 +0000 (+0000)
Subject: Merge "Fix a log typo in ML2 manager.bind_port()"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=474b3556a5bd7db4df3b52a19e4bfae92d9eee68;p=openstack-build%2Fneutron-build.git

Merge "Fix a log typo in ML2 manager.bind_port()"
---

474b3556a5bd7db4df3b52a19e4bfae92d9eee68
diff --cc neutron/plugins/ml2/managers.py
index d3518f39e,7e0bfc917..97467ba03
--- a/neutron/plugins/ml2/managers.py
+++ b/neutron/plugins/ml2/managers.py
@@@ -439,12 -439,13 +439,12 @@@ class MechanismManager(stevedore.named.
  
          :param context: PortContext instance describing the port
  
 -        Called inside transaction context on session, prior to
 -        create_port_precommit or update_port_precommit, to
 -        attempt to establish a port binding.
 +        Called outside any transaction to attempt to establish a port
 +        binding.
          """
          binding = context._binding
-         LOG.debug(_("Attempting to bind port %(port)s on host %(host)s "
-                     "for vnic_type %(vnic_type)s with profile %(profile)s"),
+         LOG.debug("Attempting to bind port %(port)s on host %(host)s "
+                   "for vnic_type %(vnic_type)s with profile %(profile)s",
                    {'port': context._port['id'],
                     'host': binding.host,
                     'vnic_type': binding.vnic_type,