Skip to content

Commit 1fd3879

Browse files
Merge remote-tracking branch 'remotes/from/ce/release/1.20.x' into release/1.20.x
2 parents 92da7f9 + 0951f7f commit 1fd3879

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

changelog/_9523.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:improvement
2+
Raft: Auto-join will now allow you to enforce IPv4 on networks that allow IPv6 and dual-stack enablement, which is on by default in certain regions.
3+
```

go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@ require (
8888
github.com/hashicorp/eventlogger v0.2.10
8989
github.com/hashicorp/go-bexpr v0.1.12
9090
github.com/hashicorp/go-cleanhttp v0.5.2
91-
github.com/hashicorp/go-discover v1.1.1-0.20250822114713-cd0e09c8e096
91+
github.com/hashicorp/go-cmp v0.0.0-20250414215908-521c6e5d9c1c
92+
github.com/hashicorp/go-discover v1.1.1-0.20250922102917-55e5010ad859
9293
github.com/hashicorp/go-gcp-common v0.9.2
9394
github.com/hashicorp/go-hclog v1.6.3
9495
github.com/hashicorp/go-kms-wrapping/entropy/v2 v2.0.1

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1395,6 +1395,8 @@ github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9n
13951395
github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
13961396
github.com/hashicorp/go-discover v1.1.1-0.20250822114713-cd0e09c8e096 h1:rjiELrWxFMy6YP8f6tIVtXhTwsoQbWwHzIk7JgcIYeY=
13971397
github.com/hashicorp/go-discover v1.1.1-0.20250822114713-cd0e09c8e096/go.mod h1:NsxyJAVM+f1GYWjoAg1dtKU7I39rOWtUjFSm2Xmuvn4=
1398+
github.com/hashicorp/go-discover v1.1.1-0.20250922102917-55e5010ad859 h1:CYvtQfS6WBZdva446zuZEpHxDfI3GTenOM4SCmGWUR8=
1399+
github.com/hashicorp/go-discover v1.1.1-0.20250922102917-55e5010ad859/go.mod h1:NsxyJAVM+f1GYWjoAg1dtKU7I39rOWtUjFSm2Xmuvn4=
13981400
github.com/hashicorp/go-discover/provider/gce v0.0.0-20241120163552-5eb1507d16b4 h1:ywaDsVo7n5ko12YD8uXjuQ8G2mQhC2mxAc4Kj3WW3GE=
13991401
github.com/hashicorp/go-discover/provider/gce v0.0.0-20241120163552-5eb1507d16b4/go.mod h1:yxikfLXA8Y5JA3FcFTR720PfqVEFd0dZY9FBpmcsO54=
14001402
github.com/hashicorp/go-gatedio v0.5.0 h1:Jm1X5yP4yCqqWj5L1TgW7iZwCVPGtVc+mro5r/XX7Tg=

0 commit comments

Comments
 (0)