summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-02-13 06:18:15 +0000
committerGerrit Code Review <review@openstack.org>2013-02-13 06:18:15 +0000
commitbceef5ac1d24f2c08cccd3be636cb43a697d76ff (patch)
treeaf47a6cc341480b1355a5ad83df3cdc0a547e3f1
parent016f1b6dd7c9d86f37f8b00925bba213b0e084a0 (diff)
parent9ff12a2d7dd165ea0c5cc9778ebd8525baa98dd6 (diff)
downloadnova-bceef5ac1d24f2c08cccd3be636cb43a697d76ff.tar.gz
nova-bceef5ac1d24f2c08cccd3be636cb43a697d76ff.tar.xz
nova-bceef5ac1d24f2c08cccd3be636cb43a697d76ff.zip
Merge "Remove locking declarator in ServiceGroup __new__()"
-rw-r--r--nova/servicegroup/api.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/nova/servicegroup/api.py b/nova/servicegroup/api.py
index 793d4bfc9..6dc1aa6d1 100644
--- a/nova/servicegroup/api.py
+++ b/nova/servicegroup/api.py
@@ -19,7 +19,6 @@
from nova.openstack.common import cfg
from nova.openstack.common import importutils
-from nova.openstack.common import lockutils
from nova.openstack.common import log as logging
from nova import utils
@@ -44,7 +43,6 @@ class API(object):
'zk': 'nova.servicegroup.drivers.zk.ZooKeeperDriver'
}
- @lockutils.synchronized('nova.servicegroup.api.new', 'nova-')
def __new__(cls, *args, **kwargs):
'''Create an instance of the servicegroup API.