Merge citrix into master.

[sliver-openvswitch.git] / debian / openvswitch-switch.template

diff --git a/debian/openvswitch-switch.template b/debian/openvswitch-switch.template
index f06d4a0..44f9210 100644 (file)
--- a/debian/openvswitch-switch.template
+++ b/debian/openvswitch-switch.template
@@ -135,13 +135,13 @@ MGMT_VCONNS="punix:/var/run/ovs-openflowd.mgmt"
 # INACTIVITY_PROBE: The maximum number of seconds of inactivity on the
 # controller connection before ovs-openflowd sends an inactivity probe
 # message to the controller.  The valid range is 5 and up.  If unset,
-# ovs-openflowd defaults to 15 seconds.
+# ovs-openflowd defaults to 5 seconds.
 #INACTIVITY_PROBE=5
 
 # MAX_BACKOFF: The maximum time that ovs-openflowd will wait between
 # attempts to connect to the controller.  The valid range is 1 and up.
-# If unset, ovs-openflowd defaults to 15 seconds.
-#MAX_BACKOFF=15
+# If unset, ovs-openflowd defaults to 8 seconds.
+#MAX_BACKOFF=8
 
 # DAEMON_OPTS: Additional options to pass to ovs-openflowd, e.g. "--fail=open"
 DAEMON_OPTS=""