[ARVADOS] updated: fd1c8009f521564eaec4dbb22cead032e3784023

[git at public.curoverse.com]

Summary of changes:
 .../test/integration/pipeline_instances_test.rb    |  2 +-
 doc/_includes/_install_postgres.liquid             |  4 +-
 services/api/lib/eventbus.rb                       |  7 +++-
 services/api/test/integration/websocket_test.rb    | 47 +++++++++++++++++++++-
 4 files changed, 55 insertions(+), 5 deletions(-)

       via  fd1c8009f521564eaec4dbb22cead032e3784023 (commit)
       via  6d2811a2e001369b950c452be3dee14db8d795c2 (commit)
       via  76c38b6bf63fa7329abb135a40710cbdbea18d44 (commit)
       via  0f0108a652d852b0bc165bf43e41fc378c49315a (commit)
       via  f4180d151eacadf1455b2ebe43ecb61cb095df7c (commit)
       via  171ac077e7335978007daf8199559290e73b8180 (commit)
       via  e302c2a74072ebe734adfb45fc6b525f299bb9fb (commit)
      from  c86a3350fe212e35a7d745d5607fbc27bc1fd3c8 (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 fd1c8009f521564eaec4dbb22cead032e3784023
Merge: 6d2811a 76c38b6
Author: radhika <radhika at curoverse.com>
Date:   Mon Jul 27 15:20:10 2015 -0400

    Merge branch 'master' into 6602-job-runtime-display


commit 6d2811a2e001369b950c452be3dee14db8d795c2
Author: radhika <radhika at curoverse.com>
Date:   Mon Jul 27 15:19:21 2015 -0400

    6602: update test assertion to match new format

diff --git a/apps/workbench/test/integration/pipeline_instances_test.rb b/apps/workbench/test/integration/pipeline_instances_test.rb
index da8f439..b6bf700 100644
--- a/apps/workbench/test/integration/pipeline_instances_test.rb
+++ b/apps/workbench/test/integration/pipeline_instances_test.rb
@@ -469,7 +469,7 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
       page_text = page.text
 
       if run_time
-        match = /This pipeline started at (.*)\. It failed after (.*) seconds at (.*)\. Check the Log/.match page_text
+        match = /This pipeline started at (.*)\. It failed after (.*) at (.*)\. Check the Log/.match page_text
       else
         match = /This pipeline started at (.*). It has been active for(.*)/.match page_text
       end

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


hooks/post-receive
--