[ARVADOS] updated: 1.2.0-385-gd2f357b41

[Git user]

Summary of changes:
 lib/controller/federation.go      | 2 --
 sdk/cwl/tests/federation/main.cwl | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

       via  d2f357b4129800a340c834f56fdd1fc534072a20 (commit)
       via  d43b9ff5e9f5810160c671b2ecadb4498a38a688 (commit)
      from  78831de038f39da27828bdb44ca1519b246a7acb (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 d2f357b4129800a340c834f56fdd1fc534072a20
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Tue Nov 13 16:37:34 2018 -0500

    14198: Fix collection PDHs for remote-case
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/sdk/cwl/tests/federation/main.cwl b/sdk/cwl/tests/federation/main.cwl
index 732661220..2a6b61a3e 100755
--- a/sdk/cwl/tests/federation/main.cwl
+++ b/sdk/cwl/tests/federation/main.cwl
@@ -194,9 +194,9 @@ steps:
       scrub_image: {default: "arvados/fed-test:remote-case"}
       scrub_collections:
         default:
-          - 031a4ced0aa99de90fb630568afc6e9b+67   # input collection
-          - eb93a6718eb1a1a8ee9f66ee7d683472+51   # md5sum output collection
-          - f654d4048612135f4a5e7707ec0fcf3e+112  # final output json
+          - fccd49fdef8e452295f718208abafd88+69   # input collection
+          - 58c0e8ea6b148134ef8577ee11307eec+51   # md5sum output collection
+          - 1fd679c5ab64c123b9764024dbf560f0+112  # final output json
     out: [out, success]
     run: framework/testcase.cwl
 

commit d43b9ff5e9f5810160c671b2ecadb4498a38a688
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Tue Nov 13 14:59:47 2018 -0500

    14198: Fix rebase error.
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/lib/controller/federation.go b/lib/controller/federation.go
index 09b3bcd42..1a0b78be2 100644
--- a/lib/controller/federation.go
+++ b/lib/controller/federation.go
@@ -96,8 +96,6 @@ func (h *Handler) setupProxyRemoteCluster(next http.Handler) http.Handler {
 
 	mux.Handle("/arvados/v1/workflows", wfHandler)
 	mux.Handle("/arvados/v1/workflows/", wfHandler)
-	mux.Handle("/arvados/v1/links", linksHandler)
-	mux.Handle("/arvados/v1/links/", linksHandler)
 	mux.Handle("/arvados/v1/containers", containersHandler)
 	mux.Handle("/arvados/v1/containers/", containersHandler)
 	mux.Handle("/arvados/v1/container_requests", containerRequestsHandler)

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


hooks/post-receive
--