From: Tom Clegg <tom@curii.com>
Date: Mon, 9 May 2022 13:49:36 +0000 (-0400)
Subject: 18794: Merge branch 'main'
X-Git-Tag: 2.5.0~184^2~1
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/0dab89df8040f203a33bc1922df0ff893791def7

18794: Merge branch 'main'

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

0dab89df8040f203a33bc1922df0ff893791def7
diff --cc cmd/arvados-server/cmd.go
index 342446a811,c9a91c8721..ae1e3fbeee
--- a/cmd/arvados-server/cmd.go
+++ b/cmd/arvados-server/cmd.go
@@@ -21,8 -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"
+ 	keepbalance "git.arvados.org/arvados.git/services/keep-balance"
  	keepweb "git.arvados.org/arvados.git/services/keep-web"
  	"git.arvados.org/arvados.git/services/keepproxy"
  	"git.arvados.org/arvados.git/services/keepstore"