summaryrefslogtreecommitdiffstats
path: root/openstack/common
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-08-31 13:26:08 +0000
committerGerrit Code Review <review@openstack.org>2012-08-31 13:26:08 +0000
commit31f5af3fd71710a1d2b09ee968c01a7861a33939 (patch)
tree3b9cfa21548db32bcb6e2c780acba1f401767a94 /openstack/common
parent5cbb9d0ed8505f97c082336e7777c72893338b02 (diff)
parent55ca1852bb489b4e3cd6af90389c7d9db88db3f6 (diff)
downloadoslo-31f5af3fd71710a1d2b09ee968c01a7861a33939.tar.gz
oslo-31f5af3fd71710a1d2b09ee968c01a7861a33939.tar.xz
oslo-31f5af3fd71710a1d2b09ee968c01a7861a33939.zip
Merge "Update zmq context cleanup to use term."
Diffstat (limited to 'openstack/common')
-rw-r--r--openstack/common/rpc/impl_zmq.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/openstack/common/rpc/impl_zmq.py b/openstack/common/rpc/impl_zmq.py
index efc94c0..aab664c 100644
--- a/openstack/common/rpc/impl_zmq.py
+++ b/openstack/common/rpc/impl_zmq.py
@@ -677,7 +677,7 @@ def cleanup():
global ZMQ_CTX
global matchmaker
matchmaker = None
- ZMQ_CTX.destroy()
+ ZMQ_CTX.term()
ZMQ_CTX = None