[ARVADOS] updated: 1.3.0-2316-ga15c20803

Git user git at public.arvados.org
Fri Feb 28 18:10:18 UTC 2020


Summary of changes:
 .../app/controllers/application_controller.rb       |  1 +
 .../app/controllers/collections_controller.rb       |  2 +-
 .../application/{error.html.erb => error.text.erb}  |  8 +++-----
 .../app/views/users/_virtual_machines.html.erb      |  2 +-
 .../test/controllers/collections_controller_test.rb |  4 ++--
 build/run-tests.sh                                  |  6 +++---
 lib/config/config.default.yml                       | 21 +++++++++++++++++++++
 lib/config/export.go                                |  1 +
 lib/config/generated_config.go                      | 21 +++++++++++++++++++++
 sdk/go/arvados/config.go                            |  1 +
 sdk/python/tests/run_test_server.py                 |  2 +-
 services/nodemanager/arvados_version.py             | 17 ++++++++++++++++-
 tools/crunchstat-summary/arvados_version.py         | 17 ++++++++++++++++-
 13 files changed, 88 insertions(+), 15 deletions(-)
 copy apps/workbench/app/views/application/{error.html.erb => error.text.erb} (59%)

       via  a15c20803fb7a1e400a028c00d1c2dd924765a3e (commit)
       via  fc60d13593b86ac0b1c00da285130c664b541987 (commit)
       via  318a73e6f18476f82b0280f23246192c1564b595 (commit)
       via  41a79db76ab767e22333121194c45306c9c7c6a3 (commit)
       via  e9582c08c1fd1a427e6f1308d344523fd452dc8b (commit)
       via  f8d2329133018a8266d2f29ff24c06671fd7fde0 (commit)
       via  1f7fe86e0038996ae18ea57ce4a470a9648681de (commit)
       via  f8b7dc97730ded2c22bedd1a8fb4f13d388a570f (commit)
       via  ee2136319b0e79e8f63330211e96448c06f71f39 (commit)
      from  8a719dbcdfd5da64172855ace2395ce682941214 (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 a15c20803fb7a1e400a028c00d1c2dd924765a3e
Merge: 8a719dbcd fc60d1359
Author: Tom Clegg <tom at tomclegg.ca>
Date:   Fri Feb 28 13:10:02 2020 -0500

    15954: Merge branch 'master'
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at tomclegg.ca>

diff --cc sdk/python/tests/run_test_server.py
index e1ccca3ec,f5528081f..262b9d2a2
--- a/sdk/python/tests/run_test_server.py
+++ b/sdk/python/tests/run_test_server.py
@@@ -755,18 -737,11 +755,18 @@@ def setup_config()
                  },
                  "Collections": {
                      "BlobSigningKey": "zfhgfenhffzltr9dixws36j1yhksjoll2grmku38mi7yxd66h5j4q9w4jzanezacp8s6q0ro3hxakfye02152hncy6zml2ed0uc",
-                     "TrustAllContent": True,
+                     "TrustAllContent": False,
                      "ForwardSlashNameSubstitution": "/",
 +                    "TrashSweepInterval": "-1s",
                  },
                  "Git": {
 -                    "Repositories": "%s/test" % os.path.join(SERVICES_SRC_DIR, 'api', 'tmp', 'git'),
 +                    "Repositories": os.path.join(SERVICES_SRC_DIR, 'api', 'tmp', 'git', 'test'),
 +                },
 +                "Containers": {
 +                    "JobsAPI": {
 +                        "GitInternalDir": os.path.join(SERVICES_SRC_DIR, 'api', 'tmp', 'internal.git'),
 +                    },
 +                    "SupportedDockerImageFormats": {"v1": {}},
                  },
                  "Volumes": {
                      "zzzzz-nyw5e-%015d"%n: {

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list