summaryrefslogtreecommitdiffstats
path: root/openstack
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-02-06 14:41:45 +0000
committerGerrit Code Review <review@openstack.org>2013-02-06 14:41:45 +0000
commit906bdb404b5061fbce141c27f7dd0d59817402f9 (patch)
tree2f9f8bd7189e3e998d71e21ae1b487bd7a145586 /openstack
parentb44c37c0af449e3dd4bf392b8b1e82f39d4b8b0a (diff)
parent9c264bcc87a2770ff7a119ea9d55790279c0060b (diff)
downloadoslo-906bdb404b5061fbce141c27f7dd0d59817402f9.tar.gz
oslo-906bdb404b5061fbce141c27f7dd0d59817402f9.tar.xz
oslo-906bdb404b5061fbce141c27f7dd0d59817402f9.zip
Merge "Remove duplicate DB options"
Diffstat (limited to 'openstack')
-rw-r--r--openstack/common/db/sqlalchemy/session.py6
1 files changed, 0 insertions, 6 deletions
diff --git a/openstack/common/db/sqlalchemy/session.py b/openstack/common/db/sqlalchemy/session.py
index 0effd5c..a49a5a8 100644
--- a/openstack/common/db/sqlalchemy/session.py
+++ b/openstack/common/db/sqlalchemy/session.py
@@ -304,12 +304,6 @@ sql_opts = [
cfg.BoolOpt('sql_connection_trace',
default=False,
help='Add python stack traces to SQL as comment strings'),
- cfg.IntOpt('sql_dbpool_enable',
- default=False,
- help="enable the use of eventlet's db_pool for MySQL"),
- cfg.BoolOpt('sql_connection_trace',
- default=False,
- help='Add python stack traces to SQL as comment strings'),
cfg.BoolOpt('sql_dbpool_enable',
default=False,
help="enable the use of eventlet's db_pool for MySQL"),