From: Tom Clegg <tom@tomclegg.ca>
Date: Tue, 7 Apr 2020 19:25:16 +0000 (-0400)
Subject: Merge branch '16053-install-deps'
X-Git-Tag: 2.1.0~259
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/c2cba51503a0e41ddd68083993e32fe085e49a7f

Merge branch '16053-install-deps'

refs #16053

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>
---

c2cba51503a0e41ddd68083993e32fe085e49a7f
diff --cc cmd/arvados-server/cmd.go
index 80d43ad848,328599826f..fcea2223da
--- a/cmd/arvados-server/cmd.go
+++ b/cmd/arvados-server/cmd.go
@@@ -14,7 -14,7 +14,8 @@@ import 
  	"git.arvados.org/arvados.git/lib/controller"
  	"git.arvados.org/arvados.git/lib/crunchrun"
  	"git.arvados.org/arvados.git/lib/dispatchcloud"
+ 	"git.arvados.org/arvados.git/lib/install"
 +	"git.arvados.org/arvados.git/services/ws"
  )
  
  var (
@@@ -26,12 -26,12 +27,13 @@@
  		"boot":            boot.Command,
  		"cloudtest":       cloudtest.Command,
  		"config-check":    config.CheckCommand,
--		"config-dump":     config.DumpCommand,
  		"config-defaults": config.DumpDefaultsCommand,
++		"config-dump":     config.DumpCommand,
  		"controller":      controller.Command,
  		"crunch-run":      crunchrun.Command,
  		"dispatch-cloud":  dispatchcloud.Command,
+ 		"install":         install.Command,
 +		"ws":              ws.Command,
  	})
  )