Automated merge with ssh://dev/flexnbd-c

2014-02-27 14:33:01 +00:00
parent fa8023cf69 705164ae3b
commit f48bf2b296
2 changed files with 8 additions and 1 deletions
--- a/tests/acceptance/flexnbd/fake_dest.rb
+++ b/tests/acceptance/flexnbd/fake_dest.rb
@@ -138,7 +138,7 @@ module FlexNBD
    end


-    def accept( err_msg = "Timed out waiting for a connection", timeout = 2)
+    def accept( err_msg = "Timed out waiting for a connection", timeout = 5)
      client_sock = nil

      begin