From 625ecb610cd491933dec311ba07ce50aa04bd8e2 Mon Sep 17 00:00:00 2001 From: Chris Behrens Date: Fri, 22 Feb 2013 16:37:28 +0000 Subject: Sync nova with oslo DB exception cleanup. DB exceptions have moved to openstack/common/db/exception module so that they can be shared with multiple DB implementations. Deadlock checking was also added to oslo to consolidate with DuplicateKey checking. This allows us to clean up our _retry_on_deadlock decorator in sqlalchemy/api.py Fixes unrelated pep8 issue with duplicate test in test_compute also. Change-Id: I7e985b384d1ef345e0d67c919b84b4faff869699 --- openstack-common.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'openstack-common.conf') diff --git a/openstack-common.conf b/openstack-common.conf index 36abed038..a2688fa45 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -1,7 +1,7 @@ [DEFAULT] # The list of modules to copy from openstack-common -modules=cliutils,context,db,db.api,db.sqlalchemy,excutils,eventlet_backdoor,fileutils,gettextutils,importutils,jsonutils,local,lockutils,log,network_utils,notifier,plugin,policy,rootwrap,setup,timeutils,rpc,uuidutils,install_venv_common,flakes,version,processutils +modules=cliutils,context,db,excutils,eventlet_backdoor,fileutils,gettextutils,importutils,jsonutils,local,lockutils,log,network_utils,notifier,plugin,policy,rootwrap,setup,timeutils,rpc,uuidutils,install_venv_common,flakes,version,processutils # The base module to hold the copy of openstack.common base=nova -- cgit