From: Tom Clegg <tom@curii.com>
Date: Tue, 12 Apr 2022 15:54:26 +0000 (-0400)
Subject: 18700: Merge branch 'main'
X-Git-Tag: 2.5.0~214^2~1
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/b53513423ab948804425424278ac554870864997

18700: Merge branch 'main'

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

b53513423ab948804425424278ac554870864997
diff --cc cmd/arvados-server/cmd.go
index c5465ee561,13b06d6795..26c3f485ea
--- a/cmd/arvados-server/cmd.go
+++ b/cmd/arvados-server/cmd.go
@@@ -42,9 -39,9 +43,10 @@@ var 
  		"dispatch-lsf":       lsf.DispatchCommand,
  		"install":            install.Command,
  		"init":               install.InitCommand,
+ 		"keepproxy":          keepproxy.Command,
  		"keepstore":          keepstore.Command,
  		"recover-collection": recovercollection.Command,
 +		"workbench2":         wb2command{},
  		"ws":                 ws.Command,
  	})
  )