summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.zuul.yaml17
-rw-r--r--oslo_db/sqlalchemy/engines.py1
2 files changed, 6 insertions, 12 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index 98cb3fb..59e6bde 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,17 +1,12 @@
- project:
- check:
- jobs:
- - openstack-tox-lower-constraints
- gate:
- jobs:
- - openstack-tox-lower-constraints
templates:
- - openstack-python-jobs
- - openstack-python35-jobs
- - publish-openstack-docs-pti
- check-requirements
- lib-forward-testing
- lib-forward-testing-python3
- - release-notes-jobs-python3
- - periodic-stable-jobs
+ - openstack-lower-constraints-jobs
+ - openstack-python-jobs
+ - openstack-python35-jobs
- openstack-python36-jobs
+ - periodic-stable-jobs
+ - publish-openstack-docs-pti
+ - release-notes-jobs-python3
diff --git a/oslo_db/sqlalchemy/engines.py b/oslo_db/sqlalchemy/engines.py
index 05045ca..999d4c3 100644
--- a/oslo_db/sqlalchemy/engines.py
+++ b/oslo_db/sqlalchemy/engines.py
@@ -159,7 +159,6 @@ def create_engine(sql_connection, sqlite_fk=False, mysql_sql_mode=None,
engine_args = {
"pool_recycle": connection_recycle_time,
- 'convert_unicode': True,
'connect_args': {},
'logging_name': logging_name
}