Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PMM-6760 Fix protobuf dependency #591

Merged
merged 2 commits into from Oct 13, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 9 additions & 6 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Gopkg.toml
Expand Up @@ -40,13 +40,13 @@ required = [
name = "github.com/pkg/errors"
version = "=0.9.1"
[[constraint]]
# FIXME Update to 1.4.3 once it is tagged. See https://github.com/golang/protobuf/issues/1219
name = "github.com/golang/protobuf"
version = "=1.4.2"
source = "github.com/cybrcodr/protobuf"
revision = "3beb084e9a50bff8d7ac57f1c9aa41671f479cbd"
[[constraint]]
# FIXME Update to 1.26.0 once it is tagged. See https://github.com/golang/protobuf/issues/1219
name = "google.golang.org/protobuf"
# version = "=1.26.0"
revision = "f62736dede0a74248d862247dbcb53ab69582a05"
version = "=1.25.0"
[[constraint]]
name = "google.golang.org/grpc"
version = "=1.32.0"
Expand Down
7 changes: 6 additions & 1 deletion api/agentlocalpb/agentlocal.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion api/agentpb/agent.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion api/agentpb/collector.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion api/inventorypb/agent_status.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion api/inventorypb/agents.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion api/inventorypb/nodes.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion api/inventorypb/services.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion api/managementpb/actions.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion api/managementpb/annotation.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion api/managementpb/checks.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion api/managementpb/dbaas/kubernetes.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.