openstack/placement
Code Issues Proposed changes

Merge "Remove nova.image.s3 and configs"

Browse Source
This commit is contained in:
Jenkins 2016-09-23 11:16:34 +00:00 committed by Gerrit Code Review
commit 8dc6b097bb
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/conf/__init__.py
View File

@ -60,7 +60,6 @@ from nova.conf import quota
from nova.conf import rdp from nova.conf import rdp
from nova.conf import remote_debug from nova.conf import remote_debug
from nova.conf import rpc from nova.conf import rpc
from nova.conf import s3
from nova.conf import scheduler from nova.conf import scheduler
from nova.conf import serial_console from nova.conf import serial_console
from nova.conf import service from nova.conf import service
@ -118,7 +117,6 @@ placement.register_opts(CONF)
quota.register_opts(CONF) quota.register_opts(CONF)
rdp.register_opts(CONF) rdp.register_opts(CONF)
rpc.register_opts(CONF) rpc.register_opts(CONF)
s3.register_opts(CONF)
scheduler.register_opts(CONF) scheduler.register_opts(CONF)
serial_console.register_opts(CONF) serial_console.register_opts(CONF)
service.register_opts(CONF) service.register_opts(CONF)

1
requirements.txt
View File

@ -4,7 +4,6 @@
pbr>=1.6 # Apache-2.0 pbr>=1.6 # Apache-2.0
SQLAlchemy<1.1.0,>=1.0.10 # MIT SQLAlchemy<1.1.0,>=1.0.10 # MIT
boto>=2.32.1 # MIT
decorator>=3.4.0 # BSD decorator>=3.4.0 # BSD
eventlet!=0.18.3,>=0.18.2 # MIT eventlet!=0.18.3,>=0.18.2 # MIT
Jinja2>=2.8 # BSD License (3 clause) Jinja2>=2.8 # BSD License (3 clause)