aboutsummaryrefslogtreecommitdiff
path: root/src/net/interface_bsd.go
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@golang.org>2016-07-13 10:49:48 -0600
committerBrad Fitzpatrick <bradfitz@golang.org>2016-07-13 18:35:40 +0000
commit4d00937cecdea85b6f1eb894a6d28a53f5f2ff8a (patch)
treee394c817134f527ac6b33d619464166ac3a218af /src/net/interface_bsd.go
parent1cb3f7169ccff3ae2197784676404e8d0d3f5e32 (diff)
downloadgo-4d00937cecdea85b6f1eb894a6d28a53f5f2ff8a.tar.xz
all: rename vendored golang.org/x/net packages to golang_org
Regression from Go 1.6 to Go 1.7rc1: we had broken the ability for users to vendor "golang.org/x/net/http2" or "golang.org/x/net/route" because we were vendoring them ourselves and cmd/go and cmd/compile do not understand multiple vendor directories across multiple GOPATH workspaces (e.g. user's $GOPATH and default $GOROOT). As a short-term fix, since fixing cmd/go and cmd/compile is too invasive at this point in the cycle, just rename "golang.org" to "golang_org" for the standard library's vendored copy. Fixes #16333 Change-Id: I9bfaed91e9f7d4ca6bab07befe80d71d437a21af Reviewed-on: https://go-review.googlesource.com/24902 Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Ian Lance Taylor <iant@golang.org>
Diffstat (limited to 'src/net/interface_bsd.go')
-rw-r--r--src/net/interface_bsd.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/net/interface_bsd.go b/src/net/interface_bsd.go
index d791cb3016..35b1c26815 100644
--- a/src/net/interface_bsd.go
+++ b/src/net/interface_bsd.go
@@ -9,7 +9,7 @@ package net
import (
"syscall"
- "golang.org/x/net/route"
+ "golang_org/x/net/route"
)
// If the ifindex is zero, interfaceTable returns mappings of all