x/vmware-nsx
Code Issues Proposed changes

Merge "Sync a change to rpc from openstack-common."

Browse Source
This commit is contained in:
Jenkins
2012-09-16 04:46:26 +00:00
committed by Gerrit Code Review
parent 3552500600 95894f2076
commit 017cc12e51
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
etc/quantum.conf
View File

@@ -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

2
quantum/openstack/common/rpc/impl_qpid.py
View File

@@ -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',