[ARVADOS] updated: 68f03bd3db859e60237507ec08c789a2c3a89ca9

[git at public.curoverse.com]

Summary of changes:
 services/api/test/integration/websocket_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

       via  68f03bd3db859e60237507ec08c789a2c3a89ca9 (commit)
       via  fbb501e3c0efb10851c00a91c0538bedb8c5e454 (commit)
      from  ab5ff91383be492d5a5bcbfdcc008cb32f37a03d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 68f03bd3db859e60237507ec08c789a2c3a89ca9
Merge: fbb501e ab5ff91
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue May 27 17:07:40 2014 -0400

    Merge branch 'master' of git.curoverse.com:arvados


commit fbb501e3c0efb10851c00a91c0538bedb8c5e454
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue May 27 17:07:11 2014 -0400

    Adjusted timeout on websocket_test from 3 seconds to 4 in an attempt to reduce
    the number of spurious timeouts on jenkins.

diff --git a/services/api/test/integration/websocket_test.rb b/services/api/test/integration/websocket_test.rb
index 9ce53a6..002bc28 100644
--- a/services/api/test/integration/websocket_test.rb
+++ b/services/api/test/integration/websocket_test.rb
@@ -31,7 +31,7 @@ class WebsocketTest < ActionDispatch::IntegrationTest
       ws.on :open do |event|
         opened = true
         if timeout
-          EM::Timer.new 3 do
+          EM::Timer.new 4 do
             too_long = true
             EM.stop_event_loop
           end

-----------------------------------------------------------------------


hooks/post-receive
--