Skip to content

Commit 3addf7a

Browse files
authored
fix: use latest coder/tailscale
Bad merge in #12252 clobbered #12574
1 parent 12ecc65 commit 3addf7a

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ replace github.com/dlclark/regexp2 => github.com/dlclark/regexp2 v1.7.0
3333

3434
// There are a few minor changes we make to Tailscale that we're slowly upstreaming. Compare here:
3535
// https://github.com/tailscale/tailscale/compare/main...coder:tailscale:main
36-
replace tailscale.com => github.com/coder/tailscale v1.1.1-0.20240214140224-3788ab894ba1
36+
replace tailscale.com => github.com/coder/tailscale v1.1.1-0.20240312053019-86ba201e56df
3737

3838
// Fixes a race-condition in coder/wgtunnel.
3939
// Upstream PR: https://github.com/WireGuard/wireguard-go/pull/85

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,8 @@ github.com/coder/serpent v0.7.0 h1:zGpD2GlF3lKIVkMjNGKbkip88qzd5r/TRcc30X/SrT0=
221221
github.com/coder/serpent v0.7.0/go.mod h1:REkJ5ZFHQUWFTPLExhXYZ1CaHFjxvGNRlLXLdsI08YA=
222222
github.com/coder/ssh v0.0.0-20231128192721-70855dedb788 h1:YoUSJ19E8AtuUFVYBpXuOD6a/zVP3rcxezNsoDseTUw=
223223
github.com/coder/ssh v0.0.0-20231128192721-70855dedb788/go.mod h1:aGQbuCLyhRLMzZF067xc84Lh7JDs1FKwCmF1Crl9dxQ=
224-
github.com/coder/tailscale v1.1.1-0.20240214140224-3788ab894ba1 h1:A7dZHNidAVH6Kxn5D3hTEH+iRO8slnM0aRer6/cxlyE=
225-
github.com/coder/tailscale v1.1.1-0.20240214140224-3788ab894ba1/go.mod h1:L8tPrwSi31RAMEMV8rjb0vYTGs7rXt8rAHbqY/p41j4=
224+
github.com/coder/tailscale v1.1.1-0.20240312053019-86ba201e56df h1:ZipFsPxJXSgTPUemHK4IFYydacrwtEmYJc4/XisybTw=
225+
github.com/coder/tailscale v1.1.1-0.20240312053019-86ba201e56df/go.mod h1:L8tPrwSi31RAMEMV8rjb0vYTGs7rXt8rAHbqY/p41j4=
226226
github.com/coder/terraform-provider-coder v0.19.0 h1:mmUXSXcar1h2wgwoHIUwdEKy9Kw0GW7fLO4Vzzf+4R4=
227227
github.com/coder/terraform-provider-coder v0.19.0/go.mod h1:pACHRoXSHBGyY696mLeQ1hR/Ag1G2wFk5bw0mT5Zp2g=
228228
github.com/coder/wgtunnel v0.1.13-0.20231127054351-578bfff9b92a h1:KhR9LUVllMZ+e9lhubZ1HNrtJDgH5YLoTvpKwmrGag4=

0 commit comments

Comments
 (0)