[ARVADOS] updated: 1.1.1-170-gd859cab

Git user git at public.curoverse.com
Wed Dec 6 04:22:52 EST 2017


Summary of changes:
 build/run-build-packages-one-target.sh                       |  9 +++++++++
 build/run-build-packages.sh                                  |  4 ++--
 build/run-tests.sh                                           |  4 ++--
 doc/_config.yml                                              |  2 +-
 ...extile.liquid => arvados-sync-groups.html.textile.liquid} | 12 ++++++------
 sdk/R/R/Arvados.R                                            |  6 +++---
 services/api/app/controllers/arvados/v1/schema_controller.rb |  1 +
 services/api/config/application.default.yml                  |  7 +++++++
 tools/arv-sync-groups/.gitignore                             |  1 -
 tools/arvbox/lib/arvbox/docker/api-setup.sh                  |  1 +
 tools/sync-groups/.gitignore                                 |  1 +
 .../arv-sync-groups.go => sync-groups/sync-groups.go}        |  6 +++---
 .../sync-groups_test.go}                                     |  0
 13 files changed, 36 insertions(+), 18 deletions(-)
 rename doc/user/topics/{arv-sync-groups.html.textile.liquid => arvados-sync-groups.html.textile.liquid} (77%)
 delete mode 100644 tools/arv-sync-groups/.gitignore
 create mode 100644 tools/sync-groups/.gitignore
 rename tools/{arv-sync-groups/arv-sync-groups.go => sync-groups/sync-groups.go} (98%)
 rename tools/{arv-sync-groups/arv-sync-groups_test.go => sync-groups/sync-groups_test.go} (100%)

       via  d859cab46630d46aa1ae7b1d8de7ec92d0a4b8fa (commit)
       via  58838a7cd8e142ce12a90f6cafb80ea0c09797d5 (commit)
       via  ee8558ddd313b037e94f3342cee304f8bd3e5e66 (commit)
       via  ceb1d9dc3bb2f80faf1a005a21ea687108841f40 (commit)
       via  50b36937d0bd921a9c3dc27080e0a3d7591b465a (commit)
       via  606168825167357b59022e8f893ff1dbb02c7a6c (commit)
       via  0cbcf8cb892c6011ae162e840e1892602d8af940 (commit)
       via  b13f48c0c80f3df65dffe0a3ba610ef12d65c2f7 (commit)
       via  7341c69d9cf26fe4e1ffba898041d73e5f1c237f (commit)
       via  61f82e9c0d9d543b86bd4fedfed2d5330eaf34c5 (commit)
      from  be76fcdd9aa19fbf8982df2543685816a4afb1e0 (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 d859cab46630d46aa1ae7b1d8de7ec92d0a4b8fa
Merge: 58838a7 ee8558d
Author: Fuad Muhic <fmuhic at capeannenterprises.com>
Date:   Wed Dec 6 10:22:38 2017 +0100

    Merge branch 'master' of git.curoverse.com:arvados into 11876-r-sdk
    
    Arvados-DCO-1.1-Signed-off-by: Fuad Muhic <fmuhic at capeannenterprises.com>


commit 58838a7cd8e142ce12a90f6cafb80ea0c09797d5
Author: Fuad Muhic <fmuhic at capeannenterprises.com>
Date:   Wed Dec 6 10:21:13 2017 +0100

    Credentials fix.
    
    Arvados-DCO-1.1-Signed-off-by: Fuad Muhic <fmuhic at capeannenterprises.com>

diff --git a/sdk/R/R/Arvados.R b/sdk/R/R/Arvados.R
index abd07f9..a546f85 100644
--- a/sdk/R/R/Arvados.R
+++ b/sdk/R/R/Arvados.R
@@ -32,7 +32,7 @@ Arvados <- setRefClass(
 
     methods = list(
 
-        initialize = function(auth_token = NULL, host_name = NULL) 
+        initialize = function(auth_token = NULL, host_name = NULL, webDavToken = NULL, webDavHostName = NULL) 
         {
             # Private state
             if(!is.null(host_name))
@@ -55,8 +55,8 @@ Arvados <- setRefClass(
             getHostName <<- function() { host }
 
             #Todo(Fudo): Hardcoded credentials to WebDAV server. Remove them later
-            getWebDavToken    <<- function() { "4invqy35tf70t7hmvdc83ges8ug9cklhgqq1l8gj2cjn18teuq" }
-            getWebDavHostName <<- function() { "https://collections.4xphq.arvadosapi.com/c=4xphq-4zz18-9d5b0qm4fgijeyi/_/" }
+            getWebDavToken    <<- function() { webDavToken }
+            getWebDavHostName <<- function() { webDavHostName }
 
             collection_get <<- function(uuid) 
             {

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list