Merge branch 'main' into weekly/f70

grafana · Jun 11, 2024 · 07e5134 · 07e5134
2 parents 990760a + 30af212
commit 07e5134
Show file tree

Hide file tree

Showing 65 changed files with 1,990 additions and 910 deletions.
diff --git a/Makefile b/Makefile
@@ -320,7 +320,7 @@ $(BIN)/updater: Makefile
 
 $(BIN)/goreleaser: Makefile go.mod
 	@mkdir -p $(@D)
-	GOBIN=$(abspath $(@D)) $(GO) install github.com/goreleaser/goreleaser@v1.20.0
+	GOBIN=$(abspath $(@D)) $(GO) install github.com/goreleaser/goreleaser/[email protected].0
 
 $(BIN)/gotestsum: Makefile go.mod
 	@mkdir -p $(@D)

diff --git a/api/gen/proto/go/ingester/v1/ingester.pb.go b/api/gen/proto/go/ingester/v1/ingester.pb.go
diff --git a/api/gen/proto/go/ingester/v1/ingester_vtproto.pb.go b/api/gen/proto/go/ingester/v1/ingester_vtproto.pb.go