From 0c47b74b84a274a7380ace9596b8b1fce62576df Mon Sep 17 00:00:00 2001
From: Russell Bryant <rbryant@redhat.com>
Date: Fri, 14 Sep 2012 13:59:03 -0400
Subject: 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: I42acdca42f27fbbe9a52441f8cf7ea8261fd8d24
---
 nova/openstack/common/rpc/impl_qpid.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova/openstack')

diff --git a/nova/openstack/common/rpc/impl_qpid.py b/nova/openstack/common/rpc/impl_qpid.py
index 4663f0046..5434ba37f 100644
--- a/nova/openstack/common/rpc/impl_qpid.py
+++ b/nova/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',
-- 
cgit