summaryrefslogtreecommitdiffstats
path: root/openstack
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-09-14 05:10:39 +0000
committerGerrit Code Review <review@openstack.org>2012-09-14 05:10:39 +0000
commit2399beca7d790105618a41f3dfcd0728a3048c0b (patch)
treefc1f2a8357950f7c0c3a63649aa1f90b6b18f73f /openstack
parent2265258dad5c6a1e535336867d9cea5c7a2355d3 (diff)
parent1a9d5c8df5aeee4faf99b54800566e386166836d (diff)
downloadoslo-2399beca7d790105618a41f3dfcd0728a3048c0b.tar.gz
oslo-2399beca7d790105618a41f3dfcd0728a3048c0b.tar.xz
oslo-2399beca7d790105618a41f3dfcd0728a3048c0b.zip
Merge "Change the qpid_heartbeat default to 60 seconds."
Diffstat (limited to 'openstack')
-rw-r--r--openstack/common/rpc/impl_qpid.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/openstack/common/rpc/impl_qpid.py b/openstack/common/rpc/impl_qpid.py
index 1b3031c..97ac7c7 100644
--- a/openstack/common/rpc/impl_qpid.py
+++ b/openstack/common/rpc/impl_qpid.py
@@ -69,7 +69,7 @@ qpid_opts = [
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',