sync oslo db/sqlalchemy module

sync oslo db/sqlalchemy module to grab "Mark sql_connection with secret flag" change. fixes bug 1160680 Change-Id: Id48419624c41eea5a0f2e130d7cdbe8a8f0a9118
openstack · Mar 28, 2013 · 6ff9c9e · 6ff9c9e
1 parent 7bf541c
commit 6ff9c9e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/nova/openstack/common/db/sqlalchemy/session.py b/nova/openstack/common/db/sqlalchemy/session.py
@@ -264,7 +264,8 @@ def soft_delete_multi_models():
                        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
@@ -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.
 #