summaryrefslogtreecommitdiffhomepage
path: root/internal
diff options
context:
space:
mode:
authorDavid Anderson <danderson@tailscale.com>2020-08-01 02:44:40 +0000
committerDavid Anderson <danderson@tailscale.com>2020-08-01 02:44:40 +0000
commite98ed6319a417caf4d665ec759d71d4bb8c8aaee (patch)
tree1c625a4c1275d91b46e3a0ff8e613625d652531d /internal
parent2ce2b632396801600b057859ae26c4b508f10e57 (diff)
parent9e26ffecf87e3a4deafc5875a8283853d7527458 (diff)
downloadtailscale-1.0.1.tar.xz
tailscale-1.0.1.zip
Merge branch 'main' into release-branch/1.0v1.0.1
Diffstat (limited to 'internal')
-rw-r--r--internal/deepprint/deepprint_test.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/internal/deepprint/deepprint_test.go b/internal/deepprint/deepprint_test.go
index d13aff8e5..d88541f67 100644
--- a/internal/deepprint/deepprint_test.go
+++ b/internal/deepprint/deepprint_test.go
@@ -11,6 +11,7 @@ import (
"github.com/tailscale/wireguard-go/wgcfg"
"inet.af/netaddr"
"tailscale.com/wgengine/router"
+ "tailscale.com/wgengine/router/dns"
)
func TestDeepPrint(t *testing.T) {
@@ -50,7 +51,7 @@ func getVal() []interface{} {
},
},
&router.Config{
- DNSConfig: router.DNSConfig{
+ DNS: dns.Config{
Nameservers: []netaddr.IP{netaddr.IPv4(8, 8, 8, 8)},
Domains: []string{"tailscale.net"},
},