From 9c264bcc87a2770ff7a119ea9d55790279c0060b Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Mon, 4 Feb 2013 15:32:33 +0000 Subject: Remove duplicate DB options sql_dbpool_enable and sql_connection_trace are declared twice. Looks like this was a merge conflict when sql_dbpool_enable changed from int to bool. Change-Id: I553c5beea916e0ee296648342324fd53167c073a --- openstack/common/db/sqlalchemy/session.py | 6 ------ 1 file changed, 6 deletions(-) (limited to 'openstack') 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"), -- cgit