diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2013-02-04 15:32:33 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2013-02-05 10:50:53 +0000 |
| commit | 9c264bcc87a2770ff7a119ea9d55790279c0060b (patch) | |
| tree | 5073cc666f32dc8b1545cac809f246419cd42f64 /openstack/common/db/sqlalchemy | |
| parent | c3da24303025f978c852dfde8babefd875322320 (diff) | |
| download | oslo-9c264bcc87a2770ff7a119ea9d55790279c0060b.tar.gz oslo-9c264bcc87a2770ff7a119ea9d55790279c0060b.tar.xz oslo-9c264bcc87a2770ff7a119ea9d55790279c0060b.zip | |
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
Diffstat (limited to 'openstack/common/db/sqlalchemy')
| -rw-r--r-- | openstack/common/db/sqlalchemy/session.py | 6 |
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"), |