diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-25 09:06:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-25 09:06:32 +0000 |
| commit | 575e74d352d685773513218a286979bb58920246 (patch) | |
| tree | e2d392774b473405f041459c8f26c173afdeb196 /openstack | |
| parent | d0793a338ce2ea8cc429e356c035ed4bba772b80 (diff) | |
| parent | 80abdcc48af5a6c67690cafcd41e5682bb1fef15 (diff) | |
| download | oslo-575e74d352d685773513218a286979bb58920246.tar.gz oslo-575e74d352d685773513218a286979bb58920246.tar.xz oslo-575e74d352d685773513218a286979bb58920246.zip | |
Merge "Fix problem with setting SSL protocol in QPid"
Diffstat (limited to 'openstack')
| -rw-r--r-- | openstack/common/rpc/impl_qpid.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openstack/common/rpc/impl_qpid.py b/openstack/common/rpc/impl_qpid.py index 46d0ac1..c908751 100644 --- a/openstack/common/rpc/impl_qpid.py +++ b/openstack/common/rpc/impl_qpid.py @@ -320,7 +320,7 @@ class Connection(object): # Reconnection is done by self.reconnect() self.connection.reconnect = False self.connection.heartbeat = self.conf.qpid_heartbeat - self.connection.protocol = self.conf.qpid_protocol + self.connection.transport = self.conf.qpid_protocol self.connection.tcp_nodelay = self.conf.qpid_tcp_nodelay def _register_consumer(self, consumer): |