diff options
| author | Chris Behrens <cbehrens@codestud.com> | 2013-02-22 16:37:28 +0000 |
|---|---|---|
| committer | Chris Behrens <cbehrens@codestud.com> | 2013-02-25 21:32:59 +0000 |
| commit | 625ecb610cd491933dec311ba07ce50aa04bd8e2 (patch) | |
| tree | b1f951bb00395153d0c659131a2e9b3da70f74af /openstack-common.conf | |
| parent | 42d058b2a1364266560dcd0aa205e743741d0a41 (diff) | |
| download | nova-625ecb610cd491933dec311ba07ce50aa04bd8e2.tar.gz nova-625ecb610cd491933dec311ba07ce50aa04bd8e2.tar.xz nova-625ecb610cd491933dec311ba07ce50aa04bd8e2.zip | |
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
Diffstat (limited to 'openstack-common.conf')
| -rw-r--r-- | openstack-common.conf | 2 |
1 files changed, 1 insertions, 1 deletions
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 |