summaryrefslogtreecommitdiffstats
path: root/nova/openstack
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-07-15 03:37:59 +0000
committerGerrit Code Review <review@openstack.org>2012-07-15 03:37:59 +0000
commita2c05274afdb81213531225ba802a339ff017d69 (patch)
treeb0c37ff452855c5ec408a588cf5a26b91641f763 /nova/openstack
parent3f878560229c82d52904f13419259a4e63ab6a05 (diff)
parent7d9d77b218a2e92d69bafb2fec4d1f1607fbc4a9 (diff)
downloadnova-a2c05274afdb81213531225ba802a339ff017d69.tar.gz
nova-a2c05274afdb81213531225ba802a339ff017d69.tar.xz
nova-a2c05274afdb81213531225ba802a339ff017d69.zip
Merge "Properly name openstack.common.exception."
Diffstat (limited to 'nova/openstack')
-rw-r--r--nova/openstack/common/rpc/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/openstack/common/rpc/__init__.py b/nova/openstack/common/rpc/__init__.py
index 1532c666e..06f2dfb2c 100644
--- a/nova/openstack/common/rpc/__init__.py
+++ b/nova/openstack/common/rpc/__init__.py
@@ -47,7 +47,7 @@ rpc_opts = [
help='Seconds to wait before a cast expires (TTL). '
'Only supported by impl_zmq.'),
cfg.ListOpt('allowed_rpc_exception_modules',
- default=['openstack.common.exception', 'nova.exception'],
+ default=['nova.openstack.common.exception', 'nova.exception'],
help='Modules of exceptions that are permitted to be recreated'
'upon receiving exception data from an rpc call.'),
cfg.StrOpt('control_exchange',