From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 7 Dec 2015 18:24:18 +0000 (+0000)
Subject: Merge "HACKING: fix edge case with log hints"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=134299beddadc2c944b3e13da5caabb12e48c469;p=openstack-build%2Fneutron-build.git

Merge "HACKING: fix edge case with log hints"
---

134299beddadc2c944b3e13da5caabb12e48c469
diff --cc neutron/pecan_wsgi/hooks/translation.py
index 82bb0350d,85d8d65c8..f20105a01
--- a/neutron/pecan_wsgi/hooks/translation.py
+++ b/neutron/pecan_wsgi/hooks/translation.py
@@@ -17,8 -17,8 +17,9 @@@ from oslo_log import log as loggin
  from pecan import hooks
  import webob.exc
  
 +from neutron._i18n import _
  from neutron.api.v2 import base as v2base
+ from neutron.i18n import _LE
  
  
  LOG = logging.getLogger(__name__)