[ARVADOS] updated: 1.1.1-183-ge5de95c

Git user git at public.curoverse.com
Thu Dec 7 11:42:37 EST 2017


Summary of changes:
 apps/workbench/test/unit/user_test.rb              |  14 ++
 build/run-build-packages-one-target.sh             |   9 +
 build/run-build-packages.sh                        |   4 +-
 build/run-tests.sh                                 |   4 +-
 doc/_config.yml                                    |   2 +-
 .../methods/container_requests.html.textile.liquid |  16 +-
 doc/api/methods/containers.html.textile.liquid     |   2 +-
 doc/install/install-keepstore.html.textile.liquid  |   2 +-
 ...uid => arvados-sync-groups.html.textile.liquid} |  12 +-
 .../controllers/arvados/v1/schema_controller.rb    |   1 +
 services/api/app/models/container.rb               |   3 +-
 services/api/app/models/container_request.rb       |   7 +-
 services/api/config/application.default.yml        |   7 +
 services/api/test/fixtures/containers.yml          |   2 +-
 services/api/test/unit/container_request_test.rb   |  43 +++-
 services/api/test/unit/container_test.rb           |  36 +++
 .../crunch-dispatch-slurm/crunch-dispatch-slurm.go |  37 ++++
 .../crunch-dispatch-slurm_test.go                  | 246 +++++++++++++--------
 services/crunch-dispatch-slurm/squeue.go           |  42 +++-
 tools/arv-sync-groups/.gitignore                   |   1 -
 tools/arvbox/lib/arvbox/docker/api-setup.sh        |   1 +
 tools/sync-groups/.gitignore                       |   1 +
 .../sync-groups.go}                                |   6 +-
 .../sync-groups_test.go}                           |   0
 24 files changed, 371 insertions(+), 127 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  e5de95c8d7040a2810238e069dd18403765ce056 (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)
       via  0632129bf7861a6ca3ef4ff4e21006a5f11e8be0 (commit)
       via  c50dc8052ca72ac1ead3236546e5f3d98beaeead (commit)
       via  c53ad9bc61054880ae6d68db8b868556c7278a78 (commit)
       via  0403d3bcd2003b0f88e0140ecfa8a62dae9bfd18 (commit)
       via  bcf069c6a726e219bc40224653268d87776e54aa (commit)
       via  b8f92203bfa5766f9aa8bfb728bb4a1580e7d6d1 (commit)
       via  d7b909ceb2646ef0637daaea70c768b799670c60 (commit)
       via  5fae6a137301f1a127ef4cccfc6bce86a6a9506c (commit)
       via  c4e6d3c9a8a55460c4ee663e66ea1093c6088d4f (commit)
       via  eaf301421b5a71e8344688723c3852e7bd5154b8 (commit)
       via  0910e857cbde6a23802ba026c3e5811e9d7b1d97 (commit)
       via  1cd144fe8da5fdc1d2e2e0ba2a3dcf47fc717251 (commit)
       via  0b1508df7ee4526340e8834422dd49ced63ee8d9 (commit)
       via  10993634c308dc62dd5e60f7d8d8ebf0391dd050 (commit)
       via  28560112303491b46c46377bc051e605e36a0927 (commit)
       via  0bc641e077a050b3f86957514fae0e4d8ba1770b (commit)
       via  ab3d39a8fdbc76425f48988c27187f3b54967ff9 (commit)
       via  c108a18d477c34c7f89d9a27af34751133329786 (commit)
      from  ae36f78143f258c4eecbee623efb2c2bfcd303a8 (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 e5de95c8d7040a2810238e069dd18403765ce056
Merge: ae36f78 ee8558d
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Thu Dec 7 11:42:07 2017 -0500

    11453: Merge branch 'master' into 11453-federated-tokens
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --cc services/api/app/controllers/arvados/v1/schema_controller.rb
index c3b3411,3adbe9e..a237829
--- a/services/api/app/controllers/arvados/v1/schema_controller.rb
+++ b/services/api/app/controllers/arvados/v1/schema_controller.rb
@@@ -55,10 -49,9 +55,11 @@@ class Arvados::V1::SchemaController < A
          crunchLogThrottleLines: Rails.application.config.crunch_log_throttle_lines,
          crunchLimitLogBytesPerJob: Rails.application.config.crunch_limit_log_bytes_per_job,
          crunchLogPartialLineThrottlePeriod: Rails.application.config.crunch_log_partial_line_throttle_period,
 +        remoteHosts: Rails.configuration.remote_hosts,
 +        remoteHostsViaDNS: Rails.configuration.remote_hosts_via_dns,
          websocketUrl: Rails.application.config.websocket_address,
          workbenchUrl: Rails.application.config.workbench_address,
+         keepWebServiceUrl: Rails.application.config.keep_web_service_url,
          parameters: {
            alt: {
              type: "string",

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list