From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 8 Oct 2015 22:20:42 +0000 (+0000)
Subject: Merge "Consume sslutils and wsgi modules from oslo.service"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=e739ba36eef3128afb3cd7f174cd6da090607146;p=openstack-build%2Fneutron-build.git

Merge "Consume sslutils and wsgi modules from oslo.service"
---

e739ba36eef3128afb3cd7f174cd6da090607146
diff --cc neutron/wsgi.py
index 89d7b8340,db46ac669..bff872b17
--- a/neutron/wsgi.py
+++ b/neutron/wsgi.py
@@@ -29,11 -27,14 +27,13 @@@ import eventlet.wsg
  from oslo_config import cfg
  import oslo_i18n
  from oslo_log import log as logging
 -from oslo_log import loggers
  from oslo_serialization import jsonutils
+ from oslo_service import _options
  from oslo_service import service as common_service
+ from oslo_service import sslutils
  from oslo_service import systemd
+ from oslo_service import wsgi
  from oslo_utils import excutils
- import routes.middleware
  import six
  import webob.dec
  import webob.exc