[ARVADOS] updated: 984e8475628cc18eaf600bea2bbdc7ce228706e8

[Git user]

Summary of changes:
 services/api/test/integration/websocket_test.rb |  4 ++--
 services/api/test/websocket_runner.rb           | 11 ++++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

       via  984e8475628cc18eaf600bea2bbdc7ce228706e8 (commit)
       via  c36840670ed16bc74a260e1c047ed70f03dc5696 (commit)
      from  db4eb863a36acbacde64f7d356065b3b9cbfb342 (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 984e8475628cc18eaf600bea2bbdc7ce228706e8
Merge: db4eb86 c368406
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Jul 1 09:59:49 2016 -0400

    Merge branch '4753-websocket-test-port'
    
    refs #4753


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


hooks/post-receive
--