From: Tom Clegg <tom@curii.com>
Date: Thu, 5 May 2022 15:25:13 +0000 (-0400)
Subject: 18794: Merge branch 'main'
X-Git-Tag: 2.5.0~184^2~6
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/ac2ea4ef187f7df369551a8cfa047fed8a1a2ba9

18794: Merge branch 'main'

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
---

ac2ea4ef187f7df369551a8cfa047fed8a1a2ba9
diff --cc cmd/arvados-server/cmd.go
index 9e02d45b67,e4bd39002a..342446a811
--- a/cmd/arvados-server/cmd.go
+++ b/cmd/arvados-server/cmd.go
@@@ -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"