summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--oslo_db/locale/en_GB/LC_MESSAGES/oslo_db-log-error.po46
-rw-r--r--oslo_db/locale/en_GB/LC_MESSAGES/oslo_db-log-info.po30
-rw-r--r--oslo_db/locale/en_GB/LC_MESSAGES/oslo_db-log-warning.po46
-rw-r--r--oslo_db/locale/es/LC_MESSAGES/oslo_db-log-error.po46
-rw-r--r--oslo_db/locale/es/LC_MESSAGES/oslo_db-log-info.po30
-rw-r--r--oslo_db/locale/es/LC_MESSAGES/oslo_db-log-warning.po47
-rw-r--r--oslo_db/locale/fr/LC_MESSAGES/oslo_db-log-error.po47
-rw-r--r--oslo_db/locale/fr/LC_MESSAGES/oslo_db-log-info.po32
-rw-r--r--oslo_db/locale/fr/LC_MESSAGES/oslo_db-log-warning.po46
-rw-r--r--oslo_db/options.py21
-rw-r--r--oslo_db/sqlalchemy/enginefacade.py3
-rw-r--r--releasenotes/notes/remove-config-option-sqlite_db-7b7c6459135fd8c9.yaml5
-rw-r--r--releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po9
-rw-r--r--releasenotes/source/locale/fr/LC_MESSAGES/releasenotes.po68
-rw-r--r--requirements.txt2
15 files changed, 80 insertions, 398 deletions
diff --git a/oslo_db/locale/en_GB/LC_MESSAGES/oslo_db-log-error.po b/oslo_db/locale/en_GB/LC_MESSAGES/oslo_db-log-error.po
deleted file mode 100644
index 3effdf8..0000000
--- a/oslo_db/locale/en_GB/LC_MESSAGES/oslo_db-log-error.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# Translations template for oslo.db.
-# Copyright (C) 2015 ORGANIZATION
-# This file is distributed under the same license as the oslo.db project.
-#
-# Translators:
-# Andi Chandler <andi@gowling.com>, 2014-2015
-# Andreas Jaeger <jaegerandi@gmail.com>, 2016. #zanata
-msgid ""
-msgstr ""
-"Project-Id-Version: oslo.db 4.6.1.dev19\n"
-"Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-04-19 04:28+0000\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2015-03-19 07:04+0000\n"
-"Last-Translator: Andi Chandler <andi@gowling.com>\n"
-"Language: en-GB\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Generated-By: Babel 2.0\n"
-"X-Generator: Zanata 3.7.3\n"
-"Language-Team: English (United Kingdom)\n"
-
-msgid "'eventlet' is required for TpoolDbapiWrapper."
-msgstr "'eventlet' is required for TpoolDbapiWrapper."
-
-msgid "DB exceeded retry limit."
-msgstr "DB exceeded retry limit."
-
-msgid "DB exception wrapped."
-msgstr "DB exception wrapped."
-
-#, python-format
-msgid "DBAPIError exception wrapped from %s"
-msgstr "DBAPIError exception wrapped from %s"
-
-#, python-format
-msgid "Failed to migrate to version %(ver)s on engine %(eng)s"
-msgstr "Failed to migrate to version %(ver)s on engine %(eng)s"
-
-msgid ""
-"Migration number for migrate plugin must be valid integer or empty, if you "
-"want to downgrade to initial state"
-msgstr ""
-"Migration number for migrate plugin must be valid integer or empty, if you "
-"want to downgrade to initial state"
diff --git a/oslo_db/locale/en_GB/LC_MESSAGES/oslo_db-log-info.po b/oslo_db/locale/en_GB/LC_MESSAGES/oslo_db-log-info.po
deleted file mode 100644
index 625378f..0000000
--- a/oslo_db/locale/en_GB/LC_MESSAGES/oslo_db-log-info.po
+++ /dev/null
@@ -1,30 +0,0 @@
-# Translations template for oslo.db.
-# Copyright (C) 2015 ORGANIZATION
-# This file is distributed under the same license as the oslo.db project.
-#
-# Translators:
-# Andi Chandler <andi@gowling.com>, 2014
-# Andreas Jaeger <jaegerandi@gmail.com>, 2016. #zanata
-msgid ""
-msgstr ""
-"Project-Id-Version: oslo.db 4.6.1.dev19\n"
-"Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-04-19 04:28+0000\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2014-11-26 01:04+0000\n"
-"Last-Translator: Andi Chandler <andi@gowling.com>\n"
-"Language: en-GB\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Generated-By: Babel 2.0\n"
-"X-Generator: Zanata 3.7.3\n"
-"Language-Team: English (United Kingdom)\n"
-
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr "Deleting duplicated row with id: %(id)s from table: %(table)s"
-
-#, python-format
-msgid "The %(dbapi)s backend is unavailable: %(err)s"
-msgstr "The %(dbapi)s backend is unavailable: %(err)s"
diff --git a/oslo_db/locale/en_GB/LC_MESSAGES/oslo_db-log-warning.po b/oslo_db/locale/en_GB/LC_MESSAGES/oslo_db-log-warning.po
deleted file mode 100644
index 3663129..0000000
--- a/oslo_db/locale/en_GB/LC_MESSAGES/oslo_db-log-warning.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# Translations template for oslo.db.
-# Copyright (C) 2015 ORGANIZATION
-# This file is distributed under the same license as the oslo.db project.
-#
-# Translators:
-# Andi Chandler <andi@gowling.com>, 2014-2015
-# Andreas Jaeger <jaegerandi@gmail.com>, 2016. #zanata
-msgid ""
-msgstr ""
-"Project-Id-Version: oslo.db 4.6.1.dev19\n"
-"Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-04-19 04:28+0000\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2015-03-19 07:04+0000\n"
-"Last-Translator: Andi Chandler <andi@gowling.com>\n"
-"Language: en-GB\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Generated-By: Babel 2.0\n"
-"X-Generator: Zanata 3.7.3\n"
-"Language-Team: English (United Kingdom)\n"
-
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr "Id not in sort_keys; is sort_keys unique?"
-
-#, python-format
-msgid ""
-"MySQL SQL mode is '%s', consider enabling TRADITIONAL or STRICT_ALL_TABLES"
-msgstr ""
-"MySQL SQL mode is '%s', consider enabling TRADITIONAL or STRICT_ALL_TABLES"
-
-#, python-format
-msgid ""
-"Parent process %(orig)s forked (%(newproc)s) with an open database "
-"connection, which is being discarded and recreated."
-msgstr ""
-"Parent process %(orig)s forked (%(newproc)s) with an open database "
-"connection, which is being discarded and recreated."
-
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr "SQL connection failed. %s attempts left."
-
-msgid "Unable to detect effective SQL mode"
-msgstr "Unable to detect effective SQL mode"
diff --git a/oslo_db/locale/es/LC_MESSAGES/oslo_db-log-error.po b/oslo_db/locale/es/LC_MESSAGES/oslo_db-log-error.po
deleted file mode 100644
index 124f844..0000000
--- a/oslo_db/locale/es/LC_MESSAGES/oslo_db-log-error.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# Translations template for oslo.db.
-# Copyright (C) 2015 ORGANIZATION
-# This file is distributed under the same license as the oslo.db project.
-#
-# Translators:
-# Adriana Chisco Landazábal <achisco94@gmail.com>, 2015
-# Andreas Jaeger <jaegerandi@gmail.com>, 2016. #zanata
-msgid ""
-msgstr ""
-"Project-Id-Version: oslo.db 4.6.1.dev19\n"
-"Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-04-19 04:28+0000\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2015-06-22 09:08+0000\n"
-"Last-Translator: Adriana Chisco Landazábal <achisco94@gmail.com>\n"
-"Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Generated-By: Babel 2.0\n"
-"X-Generator: Zanata 3.7.3\n"
-"Language-Team: Spanish\n"
-
-msgid "'eventlet' is required for TpoolDbapiWrapper."
-msgstr "Se necesita 'eventlet' para TpoolDbapiWrapper."
-
-msgid "DB exceeded retry limit."
-msgstr "La base de datos excedió el límite de intentos."
-
-msgid "DB exception wrapped."
-msgstr "excepción de base de datos empaquetada."
-
-#, python-format
-msgid "DBAPIError exception wrapped from %s"
-msgstr "Excepción de error DBAPI empaquetada de %s"
-
-#, python-format
-msgid "Failed to migrate to version %(ver)s on engine %(eng)s"
-msgstr "Error al migrar a versión %(ver)s en motor %(eng)s"
-
-msgid ""
-"Migration number for migrate plugin must be valid integer or empty, if you "
-"want to downgrade to initial state"
-msgstr ""
-"Si desea volver al estado inicial de la versión anterior, el número de "
-"migración para el complemento de migración debe ser un entero válido o vacío"
diff --git a/oslo_db/locale/es/LC_MESSAGES/oslo_db-log-info.po b/oslo_db/locale/es/LC_MESSAGES/oslo_db-log-info.po
deleted file mode 100644
index 977c4ef..0000000
--- a/oslo_db/locale/es/LC_MESSAGES/oslo_db-log-info.po
+++ /dev/null
@@ -1,30 +0,0 @@
-# Translations template for oslo.db.
-# Copyright (C) 2015 ORGANIZATION
-# This file is distributed under the same license as the oslo.db project.
-#
-# Translators:
-# Adriana Chisco Landazábal <achisco94@gmail.com>, 2015
-# Andreas Jaeger <jaegerandi@gmail.com>, 2016. #zanata
-msgid ""
-msgstr ""
-"Project-Id-Version: oslo.db 4.6.1.dev19\n"
-"Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-04-19 04:28+0000\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2015-06-22 09:10+0000\n"
-"Last-Translator: Adriana Chisco Landazábal <achisco94@gmail.com>\n"
-"Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Generated-By: Babel 2.0\n"
-"X-Generator: Zanata 3.7.3\n"
-"Language-Team: Spanish\n"
-
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr "Eliminando fila duplicada con id: %(id)s de la tabla: %(table)s"
-
-#, python-format
-msgid "The %(dbapi)s backend is unavailable: %(err)s"
-msgstr "El %(dbapi)s backend ino está disponible: %(err)s"
diff --git a/oslo_db/locale/es/LC_MESSAGES/oslo_db-log-warning.po b/oslo_db/locale/es/LC_MESSAGES/oslo_db-log-warning.po
deleted file mode 100644
index 4d5ec75..0000000
--- a/oslo_db/locale/es/LC_MESSAGES/oslo_db-log-warning.po
+++ /dev/null
@@ -1,47 +0,0 @@
-# Translations template for oslo.db.
-# Copyright (C) 2015 ORGANIZATION
-# This file is distributed under the same license as the oslo.db project.
-#
-# Translators:
-# Adriana Chisco Landazábal <achisco94@gmail.com>, 2015
-# Andreas Jaeger <jaegerandi@gmail.com>, 2016. #zanata
-msgid ""
-msgstr ""
-"Project-Id-Version: oslo.db 4.6.1.dev19\n"
-"Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-04-19 04:28+0000\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2015-06-22 09:13+0000\n"
-"Last-Translator: Adriana Chisco Landazábal <achisco94@gmail.com>\n"
-"Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Generated-By: Babel 2.0\n"
-"X-Generator: Zanata 3.7.3\n"
-"Language-Team: Spanish\n"
-
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr "Id no está en sort_keys; ¿sort_keys es exclusivo?"
-
-#, python-format
-msgid ""
-"MySQL SQL mode is '%s', consider enabling TRADITIONAL or STRICT_ALL_TABLES"
-msgstr ""
-"El modo MySQL de SL es: '%s', considere habilitar TRADITIONAL o "
-"STRICT_ALL_TABLES"
-
-#, python-format
-msgid ""
-"Parent process %(orig)s forked (%(newproc)s) with an open database "
-"connection, which is being discarded and recreated."
-msgstr ""
-"El proceso padre %(orig)s bifurcó (%(newproc)s) con una conexión abierta de "
-"base de datos, la cual se está descartando y creando de nuevo."
-
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr "La conexión SQL ha fallado. Quedan %s intentos."
-
-msgid "Unable to detect effective SQL mode"
-msgstr "No es posible detectar modo SQL efectivo"
diff --git a/oslo_db/locale/fr/LC_MESSAGES/oslo_db-log-error.po b/oslo_db/locale/fr/LC_MESSAGES/oslo_db-log-error.po
deleted file mode 100644
index 996b2ba..0000000
--- a/oslo_db/locale/fr/LC_MESSAGES/oslo_db-log-error.po
+++ /dev/null
@@ -1,47 +0,0 @@
-# Translations template for oslo.db.
-# Copyright (C) 2015 ORGANIZATION
-# This file is distributed under the same license as the oslo.db project.
-#
-# Translators:
-# Maxime COQUEREL <max.coquerel@gmail.com>, 2014-2015
-# Andreas Jaeger <jaegerandi@gmail.com>, 2016. #zanata
-msgid ""
-msgstr ""
-"Project-Id-Version: oslo.db 4.6.1.dev19\n"
-"Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-04-19 04:28+0000\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2015-02-18 02:50+0000\n"
-"Last-Translator: Maxime COQUEREL <max.coquerel@gmail.com>\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"Generated-By: Babel 2.0\n"
-"X-Generator: Zanata 3.7.3\n"
-"Language-Team: French\n"
-
-msgid "'eventlet' is required for TpoolDbapiWrapper."
-msgstr "'eventlet' est requis pour poolDbapiWrapper."
-
-msgid "DB exceeded retry limit."
-msgstr "DB limite de tentatives dépassé."
-
-msgid "DB exception wrapped."
-msgstr "DB exception enveloppé."
-
-#, python-format
-msgid "DBAPIError exception wrapped from %s"
-msgstr "Exception DBAPIError enveloppé depuis %s"
-
-#, python-format
-msgid "Failed to migrate to version %(ver)s on engine %(eng)s"
-msgstr "Échec de migration de la version %(ver)s sur le moteur %(eng)s"
-
-msgid ""
-"Migration number for migrate plugin must be valid integer or empty, if you "
-"want to downgrade to initial state"
-msgstr ""
-"Le numéro de migration pour la migration de plugin doit être un entier "
-"valide ou un champs nul, si vous souhaitez revenir vers l'état initial de la "
-"précédente version"
diff --git a/oslo_db/locale/fr/LC_MESSAGES/oslo_db-log-info.po b/oslo_db/locale/fr/LC_MESSAGES/oslo_db-log-info.po
deleted file mode 100644
index 74a17a4..0000000
--- a/oslo_db/locale/fr/LC_MESSAGES/oslo_db-log-info.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# Translations template for oslo.db.
-# Copyright (C) 2015 ORGANIZATION
-# This file is distributed under the same license as the oslo.db project.
-#
-# Translators:
-# Maxime COQUEREL <max.coquerel@gmail.com>, 2014
-# Andreas Jaeger <jaegerandi@gmail.com>, 2016. #zanata
-msgid ""
-msgstr ""
-"Project-Id-Version: oslo.db 4.6.1.dev19\n"
-"Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-04-19 04:28+0000\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2014-11-23 06:38+0000\n"
-"Last-Translator: Maxime COQUEREL <max.coquerel@gmail.com>\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"Generated-By: Babel 2.0\n"
-"X-Generator: Zanata 3.7.3\n"
-"Language-Team: French\n"
-
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-"Suppression de la ligne dupliquée avec l'id: %(id)s depuis la table: "
-"%(table)s"
-
-#, python-format
-msgid "The %(dbapi)s backend is unavailable: %(err)s"
-msgstr "%(dbapi)s backend n'est pas disponible: %(err)s"
diff --git a/oslo_db/locale/fr/LC_MESSAGES/oslo_db-log-warning.po b/oslo_db/locale/fr/LC_MESSAGES/oslo_db-log-warning.po
deleted file mode 100644
index a2203db..0000000
--- a/oslo_db/locale/fr/LC_MESSAGES/oslo_db-log-warning.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# Translations template for oslo.db.
-# Copyright (C) 2015 ORGANIZATION
-# This file is distributed under the same license as the oslo.db project.
-#
-# Translators:
-# Lucas Mascaro <mascaro.lucas@yahoo.fr>, 2015
-# Maxime COQUEREL <max.coquerel@gmail.com>, 2014
-# Andreas Jaeger <jaegerandi@gmail.com>, 2016. #zanata
-msgid ""
-msgstr ""
-"Project-Id-Version: oslo.db 4.6.1.dev19\n"
-"Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-04-19 04:28+0000\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2015-08-17 11:08+0000\n"
-"Last-Translator: Lucas Mascaro <mascaro.lucas@yahoo.fr>\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"Generated-By: Babel 2.0\n"
-"X-Generator: Zanata 3.7.3\n"
-"Language-Team: French\n"
-
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr "Id n'est pas dans sort_keys; sort_keys est unique ?"
-
-#, python-format
-msgid ""
-"MySQL SQL mode is '%s', consider enabling TRADITIONAL or STRICT_ALL_TABLES"
-msgstr "MySQL SQL mode est '%s', TRADITIONAL ou STRICT_ALL_TABLES"
-
-#, python-format
-msgid ""
-"Parent process %(orig)s forked (%(newproc)s) with an open database "
-"connection, which is being discarded and recreated."
-msgstr ""
-"Le processus parent %(orig)s s'est séparé (%(newproc)s) avec une connection "
-"a la base de donnée ouverte, elle sera rejetée et recréée."
-
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr "Echec de connexion SQL. %s tentatives échouées"
-
-msgid "Unable to detect effective SQL mode"
-msgstr "Impossible de détecter le mode SQL"
diff --git a/oslo_db/options.py b/oslo_db/options.py
index d5d15cf..1ce2381 100644
--- a/oslo_db/options.py
+++ b/oslo_db/options.py
@@ -10,18 +10,10 @@
# License for the specific language governing permissions and limitations
# under the License.
-from debtcollector import removals
from oslo_config import cfg
database_opts = [
- cfg.StrOpt('sqlite_db',
- deprecated_for_removal=True,
- deprecated_reason='Should use config option connection or '
- 'slave_connection to connect the database.',
- deprecated_group='DEFAULT',
- default='oslo.sqlite',
- help='The file name to use with SQLite.'),
cfg.BoolOpt('sqlite_synchronous',
deprecated_group='DEFAULT',
default=True,
@@ -143,12 +135,8 @@ database_opts = [
]
-@removals.removed_kwarg("sqlite_db",
- "Config option sqlite_db is deprecated for removal,"
- "please use option `connection`.")
-def set_defaults(conf, connection=None, sqlite_db=None,
- max_pool_size=None, max_overflow=None,
- pool_timeout=None):
+def set_defaults(conf, connection=None, max_pool_size=None,
+ max_overflow=None, pool_timeout=None):
"""Set defaults for configuration variables.
Overrides default options values.
@@ -165,9 +153,6 @@ def set_defaults(conf, connection=None, sqlite_db=None,
* sqlite:////absolute/path/to/file.db
:type connection: str
- :keyword sqlite_db: path to SQLite database file.
- :type sqlite_db: str
-
:keyword max_pool_size: maximum connections pool size. The size of the pool
to be maintained, defaults to 5. This is the largest number of connections
that will be kept persistently in the pool. Note that the pool begins with
@@ -200,8 +185,6 @@ def set_defaults(conf, connection=None, sqlite_db=None,
if connection is not None:
conf.set_default('connection', connection, group='database')
- if sqlite_db is not None:
- conf.set_default('sqlite_db', sqlite_db, group='database')
if max_pool_size is not None:
conf.set_default('max_pool_size', max_pool_size, group='database')
if max_overflow is not None:
diff --git a/oslo_db/sqlalchemy/enginefacade.py b/oslo_db/sqlalchemy/enginefacade.py
index 2519668..88bca6b 100644
--- a/oslo_db/sqlalchemy/enginefacade.py
+++ b/oslo_db/sqlalchemy/enginefacade.py
@@ -169,8 +169,7 @@ class _TransactionFactory(object):
'db_max_retries', 'db_inc_retry_interval',
'use_db_reconnect',
'db_retry_interval', 'min_pool_size',
- 'db_max_retry_interval',
- 'sqlite_db', 'backend'])
+ 'db_max_retry_interval', 'backend'])
self._started = False
self._legacy_facade = None
diff --git a/releasenotes/notes/remove-config-option-sqlite_db-7b7c6459135fd8c9.yaml b/releasenotes/notes/remove-config-option-sqlite_db-7b7c6459135fd8c9.yaml
new file mode 100644
index 0000000..d8f10d0
--- /dev/null
+++ b/releasenotes/notes/remove-config-option-sqlite_db-7b7c6459135fd8c9.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+ - The configuration option ``sqlite_db`` is removed. Pease use
+ configuration option ``connection`` or ``slave_connection``
+ to connect to the database.
diff --git a/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po b/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po
index 437f4c3..ed16396 100644
--- a/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po
+++ b/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po
@@ -1,9 +1,9 @@
# Andi Chandler <andi@gowling.com>, 2016. #zanata
msgid ""
msgstr ""
-"Project-Id-Version: oslo.db Release Notes 4.6.1.dev51\n"
+"Project-Id-Version: oslo.db Release Notes 4.18.1.dev1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-27 15:51+0000\n"
+"POT-Creation-Date: 2017-03-14 11:56+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -11,12 +11,9 @@ msgstr ""
"Last-Translator: Andi Chandler <andi@gowling.com>\n"
"Language-Team: English (United Kingdom)\n"
"Language: en-GB\n"
-"X-Generator: Zanata 3.7.3\n"
+"X-Generator: Zanata 3.9.6\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-msgid "2.6.0-7"
-msgstr "2.6.0-7"
-
msgid "4.6.0"
msgstr "4.6.0"
diff --git a/releasenotes/source/locale/fr/LC_MESSAGES/releasenotes.po b/releasenotes/source/locale/fr/LC_MESSAGES/releasenotes.po
new file mode 100644
index 0000000..2e59655
--- /dev/null
+++ b/releasenotes/source/locale/fr/LC_MESSAGES/releasenotes.po
@@ -0,0 +1,68 @@
+# Gérald LONLAS <g.lonlas@gmail.com>, 2016. #zanata
+msgid ""
+msgstr ""
+"Project-Id-Version: oslo.db Release Notes 4.18.1.dev1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-03-14 11:56+0000\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2016-10-22 05:59+0000\n"
+"Last-Translator: Gérald LONLAS <g.lonlas@gmail.com>\n"
+"Language-Team: French\n"
+"Language: fr\n"
+"X-Generator: Zanata 3.9.6\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+msgid "2.6.0-9"
+msgstr "2.6.0-9"
+
+msgid "4.12.0"
+msgstr "4.12.0"
+
+msgid "4.6.0"
+msgstr "4.6.0"
+
+msgid "4.8.0"
+msgstr "4.8.0"
+
+msgid "4.9.0"
+msgstr "4.9.0"
+
+msgid "Bug Fixes"
+msgstr "Corrections de bugs"
+
+msgid "Deprecation Notes"
+msgstr "Notes dépréciées "
+
+msgid "Liberty Series Release Notes"
+msgstr "Note de release pour Liberty"
+
+msgid "Mitaka Series Release Notes"
+msgstr "Note de release pour Mitaka"
+
+msgid "New Features"
+msgstr "Nouvelles fonctionnalités"
+
+msgid "Newton Series Release Notes"
+msgstr "Note de release pour Newton"
+
+msgid "Other Notes"
+msgstr "Autres notes"
+
+msgid "Unreleased Release Notes"
+msgstr "Note de release pour les changements non déployées"
+
+msgid "Upgrade Notes"
+msgstr "Notes de mises à jours"
+
+msgid ""
+"http://lists.openstack.org/pipermail/openstack-dev/2015-December/082717.html"
+msgstr ""
+"http://lists.openstack.org/pipermail/openstack-dev/2015-December/082717.html"
+
+msgid "https://bugs.launchpad.net/oslo.db/+bug/1535375"
+msgstr "https://bugs.launchpad.net/oslo.db/+bug/1535375"
+
+msgid "oslo.db Release Notes"
+msgstr "Note de release pour oslo.db"
diff --git a/requirements.txt b/requirements.txt
index 7e82b15..ca5511c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ oslo.i18n>=2.1.0 # Apache-2.0
oslo.config>=3.22.0 # Apache-2.0
oslo.context>=2.12.0 # Apache-2.0
oslo.utils>=3.20.0 # Apache-2.0
-SQLAlchemy<1.1.0,>=1.0.10 # MIT
+SQLAlchemy>=1.0.10 # MIT
sqlalchemy-migrate>=0.9.6 # Apache-2.0
stevedore>=1.20.0 # Apache-2.0
six>=1.9.0 # MIT