summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-12-16 06:17:43 +0000
committerGerrit Code Review <review@openstack.org>2012-12-16 06:17:43 +0000
commitf04722ee22feed97aca23cd16864626d9672671c (patch)
treebdedb51fd51fdc29aa806d45663e3a6697928fa1
parent2f8ffcc46db933ba27e14835c4448320bee5daa0 (diff)
parenta630ea4e0d2d93ac76df41e784b3af3af779bed3 (diff)
downloadnova-f04722ee22feed97aca23cd16864626d9672671c.tar.gz
nova-f04722ee22feed97aca23cd16864626d9672671c.tar.xz
nova-f04722ee22feed97aca23cd16864626d9672671c.zip
Merge "Ensure that sql_dbpool_enable is a boolean value"
-rw-r--r--nova/db/sqlalchemy/session.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/nova/db/sqlalchemy/session.py b/nova/db/sqlalchemy/session.py
index 66ff0f916..cb05cc444 100644
--- a/nova/db/sqlalchemy/session.py
+++ b/nova/db/sqlalchemy/session.py
@@ -216,11 +216,11 @@ sql_opts = [
help='Verbosity of SQL debugging information. 0=None, '
'100=Everything'),
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"),
+ 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"),
]
CONF = cfg.CONF