diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-29 12:37:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-29 12:37:47 +0000 |
| commit | d4e1926d53b28a23427f7f541cf0fad443c90a53 (patch) | |
| tree | d07a8c1164cca5b466242a1c2b6cf98bcea74712 /nova/openstack | |
| parent | 2134199856dc66284925d024b053a639818b0181 (diff) | |
| parent | 6ff9c9effe011cb7d8d5479ec8cd2f6c7f61705c (diff) | |
Merge "sync oslo db/sqlalchemy module"
Diffstat (limited to 'nova/openstack')
| -rw-r--r-- | nova/openstack/common/db/sqlalchemy/session.py | 3 | ||||
| -rw-r--r-- | nova/openstack/common/db/sqlalchemy/utils.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nova/openstack/common/db/sqlalchemy/session.py b/nova/openstack/common/db/sqlalchemy/session.py index cf6713581..010254e7a 100644 --- a/nova/openstack/common/db/sqlalchemy/session.py +++ b/nova/openstack/common/db/sqlalchemy/session.py @@ -264,7 +264,8 @@ sql_opts = [ os.path.abspath(os.path.join(os.path.dirname(__file__), '../', '$sqlite_db')), help='The SQLAlchemy connection string used to connect to the ' - 'database'), + 'database', + secret=True), cfg.StrOpt('sqlite_db', default='nova.sqlite', help='the filename to use with sqlite'), diff --git a/nova/openstack/common/db/sqlalchemy/utils.py b/nova/openstack/common/db/sqlalchemy/utils.py index 6a9cb846f..3f5ae737a 100644 --- a/nova/openstack/common/db/sqlalchemy/utils.py +++ b/nova/openstack/common/db/sqlalchemy/utils.py @@ -2,7 +2,7 @@ # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. -# Copyright 2010-2011 OpenStack Foundation +# Copyright 2010-2011 OpenStack Foundation. # Copyright 2012 Justin Santa Barbara # All Rights Reserved. # |