Permalink
Browse files

Sync a change to rpc from openstack-common.

This commit pulls in the following change from openstack-common:

    ee44222 Change the qpid_heartbeat default to 60 seconds.

Fix bug 1050661.

Change-Id: I2cb63d091f3d8a9a35d0e35ef18b70409c1f09ae
  • Loading branch information...
russellb committed Sep 14, 2012
1 parent d405b4c commit c307e5e26f72e7567e4c6c916a04e281f65fe2a2
Showing with 2 additions and 2 deletions.
  1. +1 −1 etc/quantum.conf
  2. +1 −1 quantum/openstack/common/rpc/impl_qpid.py
View
@@ -115,7 +115,7 @@ control_exchange = quantum
# Equivalent to setting max and min to the same value
# qpid_reconnect_interval = 0
# Seconds between connection keepalive heartbeats
# qpid_heartbeat = 5
# qpid_heartbeat = 60
# Transport to use, either 'tcp' or 'ssl'
# qpid_protocol = tcp
# Disable Nagle algorithm
@@ -69,7 +69,7 @@
default=0,
help='Equivalent to setting max and min to the same value'),
cfg.IntOpt('qpid_heartbeat',
default=5,
default=60,
help='Seconds between connection keepalive heartbeats'),
cfg.StrOpt('qpid_protocol',
default='tcp',

0 comments on commit c307e5e

Please sign in to comment.