Merge branch '21660-inode-test-race'

[arvados.git] / cmd / arvados-server / cmd.go

diff --git a/cmd/arvados-server/cmd.go b/cmd/arvados-server/cmd.go
index 438ca206daa06dbb9f5211fce8bf57ed788cf6a0..0f267a9b408f70afe2f370f172447fbf7128db2c 100644 (file)
--- a/cmd/arvados-server/cmd.go
+++ b/cmd/arvados-server/cmd.go
@@ -21,6 +21,7 @@ import (
        "git.arvados.org/arvados.git/lib/config"
        "git.arvados.org/arvados.git/lib/controller"
        "git.arvados.org/arvados.git/lib/crunchrun"
+       "git.arvados.org/arvados.git/lib/crunchstat"
        "git.arvados.org/arvados.git/lib/dispatchcloud"
        "git.arvados.org/arvados.git/lib/install"
        "git.arvados.org/arvados.git/lib/lsf"
@@ -29,7 +30,6 @@ import (
        "git.arvados.org/arvados.git/sdk/go/arvados"
        "git.arvados.org/arvados.git/sdk/go/health"
        dispatchslurm "git.arvados.org/arvados.git/services/crunch-dispatch-slurm"
-       "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"
@@ -52,10 +52,10 @@ var (
                "config-dump":        config.DumpCommand,
                "controller":         controller.Command,
                "crunch-run":         crunchrun.Command,
+               "crunchstat":         crunchstat.Command,
                "dispatch-cloud":     dispatchcloud.Command,
                "dispatch-lsf":       lsf.DispatchCommand,
                "dispatch-slurm":     dispatchslurm.Command,
-               "git-httpd":          githttpd.Command,
                "health":             healthCommand,
                "install":            install.Command,
                "init":               install.InitCommand,