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.

Sign up for GitHub

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

Jump to bottom

Update 1.15.x after re-publishing modules #21660

Merged
merged 6 commits into from
Aug 26, 2024
Merged

Update 1.15.x after re-publishing modules #21660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6827008
envoyextensions/v0.2.3
jmurret Aug 26, 2024
c6c68c3
envoyextensions/v0.2.4
jmurret Aug 26, 2024
7058e23
restore replace statements in api after api module was published.
jmurret Aug 26, 2024
8b091a3
troubleshoot/v0.2.2
jmurret Aug 26, 2024
a1a6391
restore replace statements in api after troubleshoot module was publi…
jmurret Aug 26, 2024
c89e220
updating rootgo.mod
jmurret Aug 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion envoyextensions/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ replace github.com/hashicorp/consul/api => ../api

require (
github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1
github.com/hashicorp/consul/api v1.21.2
github.com/hashicorp/consul/api v1.21.3
github.com/hashicorp/consul/sdk v0.13.1
github.com/hashicorp/go-hclog v1.2.1
github.com/hashicorp/go-multierror v1.1.1
Expand Down
6 changes: 3 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ require (
github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4
github.com/hashicorp/consul-awsauth v0.0.0-20220713182709-05ac1c5c2706
github.com/hashicorp/consul-net-rpc v0.0.0-20221205195236-156cfab66a69
github.com/hashicorp/consul/api v1.21.2
github.com/hashicorp/consul/envoyextensions v0.2.2
github.com/hashicorp/consul/api v1.21.3
github.com/hashicorp/consul/envoyextensions v0.2.4
github.com/hashicorp/consul/proto-public v0.3.0
github.com/hashicorp/consul/sdk v0.13.1
github.com/hashicorp/consul/troubleshoot v0.2.1
github.com/hashicorp/consul/troubleshoot v0.2.2
github.com/hashicorp/go-bexpr v0.1.2
github.com/hashicorp/go-checkpoint v0.5.0
github.com/hashicorp/go-cleanhttp v0.5.2
Expand Down
2 changes: 1 addition & 1 deletion test/integration/consul-container/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/avast/retry-go v3.0.0+incompatible
github.com/docker/docker v24.0.5+incompatible
github.com/docker/go-connections v0.4.0
github.com/hashicorp/consul/api v1.21.2
github.com/hashicorp/consul/api v1.21.3
github.com/hashicorp/consul/envoyextensions v0.2.1
github.com/hashicorp/consul/sdk v0.13.1
github.com/hashicorp/go-cleanhttp v0.5.2
Expand Down
11 changes: 6 additions & 5 deletions troubleshoot/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ module github.com/hashicorp/consul/troubleshoot

go 1.19

replace github.com/hashicorp/consul/api => ../api

replace github.com/hashicorp/consul/envoyextensions => ../envoyextensions
replace (
github.com/hashicorp/consul/api => ../api
github.com/hashicorp/consul/envoyextensions => ../envoyextensions
)

exclude (
github.com/hashicorp/go-msgpack v1.1.5 // has breaking changes and must be avoided
Expand All @@ -14,8 +15,8 @@ exclude (
require (
github.com/envoyproxy/go-control-plane v0.11.1
github.com/envoyproxy/go-control-plane/xdsmatcher v0.0.0-20231026140209-dc05a22efe95
github.com/hashicorp/consul/api v1.21.2
github.com/hashicorp/consul/envoyextensions v0.2.2
github.com/hashicorp/consul/api v1.21.3
github.com/hashicorp/consul/envoyextensions v0.2.4
github.com/hashicorp/consul/sdk v0.13.1
github.com/stretchr/testify v1.8.4
google.golang.org/protobuf v1.33.0
Expand Down
Loading