Debian: Update change log for 1.1.0~pre2.g2.ea763e0e-1 upload

[openvswitch] / xenserver / usr_sbin_brctl

diff --git a/xenserver/usr_sbin_brctl b/xenserver/usr_sbin_brctl
index 7fecc56480390c14219d9aaba28ee4db94a249b7..5cf0b88ac7f6b61c8c4b4dc53f2c3c28e16a7cef 100755 (executable)
--- a/xenserver/usr_sbin_brctl
+++ b/xenserver/usr_sbin_brctl
@@ -35,7 +35,7 @@ def delegate():
 
 def call_vsctl(cmd, arg=""):
     database = '--db=' + OVSDB_SERVER
-    command = [VSCTL, database, cmd]
+    command = [VSCTL, '--timeout=30', database, cmd]
     if (arg):
         command.append(arg)
     return subprocess.Popen(command, stdout=subprocess.PIPE).communicate()[0].split()