Merge branch 'main' into llb-byow

# Conflicts:
#	internal/daemon/controller/handlers/targets/target_service.go
#	internal/daemon/controller/handlers/workers/multihop_service.go
#	internal/daemon/controller/handlers/workers/worker_proxy_service.go
#	internal/daemon/controller/handlers/workers/worker_service.go
#	internal/daemon/worker/status.go
#	internal/daemon/worker/worker.go
This commit is contained in:
Todd committed 2022-05-09 14:14:52 -07:00
commit d8a443e238
179 files changed
+278 -273

No files matched your search

+2 -2
View File
@@ -5,10 +5,10 @@ import (
"testing"
"github.com/hashicorp/boundary/internal/cmd/config"
"github.com/hashicorp/boundary/internal/servers/controller"
"github.com/hashicorp/boundary/internal/daemon/controller"
wrapping "github.com/hashicorp/go-kms-wrapping/v2"
_ "github.com/hashicorp/boundary/internal/servers/controller/handlers/targets/tcp"
_ "github.com/hashicorp/boundary/internal/daemon/controller/handlers/targets/tcp"
)
type option struct {