]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commitdiff
Merge "Consume sslutils and wsgi modules from oslo.service"
authorJenkins <jenkins@review.openstack.org>
Thu, 8 Oct 2015 22:20:42 +0000 (22:20 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 8 Oct 2015 22:20:42 +0000 (22:20 +0000)
1  2 
etc/neutron.conf
neutron/common/config.py
neutron/tests/unit/test_wsgi.py
neutron/wsgi.py

Simple merge
Simple merge
Simple merge
diff --cc neutron/wsgi.py
index 89d7b8340d79b2aa2dddb832d71f314b92bf15eb,db46ac669ddc1642b6e1994ce8caa9b42b409a30..bff872b17769711dd7cae673953bb63ab563e084
@@@ -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