18794: Merge branch 'main'
authorTom Clegg <tom@curii.com>
Thu, 5 May 2022 15:25:13 +0000 (11:25 -0400)
committerTom Clegg <tom@curii.com>
Thu, 5 May 2022 15:25:13 +0000 (11:25 -0400)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

1  2 
cmd/arvados-server/cmd.go
lib/config/load.go
lib/service/cmd.go
sdk/go/arvados/config.go
sdk/go/health/aggregator_test.go
sdk/python/tests/run_test_server.py

index 9e02d45b672cfa811aba39b872d7c3022b96fbc6,e4bd39002aafaab29a5ed690fc09a3174f30effc..342446a811f228a2fffeff990056a09fe08b7704
@@@ -21,7 -21,8 +21,9 @@@ import 
        "git.arvados.org/arvados.git/lib/install"
        "git.arvados.org/arvados.git/lib/lsf"
        "git.arvados.org/arvados.git/lib/recovercollection"
 +      "git.arvados.org/arvados.git/sdk/go/health"
+       "git.arvados.org/arvados.git/services/githttpd"
+       keepweb "git.arvados.org/arvados.git/services/keep-web"
        "git.arvados.org/arvados.git/services/keepproxy"
        "git.arvados.org/arvados.git/services/keepstore"
        "git.arvados.org/arvados.git/services/ws"
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge