From 9194b4c29dd37e76d71292bfdef198dae78047b5 Mon Sep 17 00:00:00 2001
From: Yong Tang <yong.tang.github@outlook.com>
Date: Wed, 21 Feb 2018 23:25:40 -0800
Subject: [PATCH] Update golang.org/x/net and golang.org/x/text (#1553)

This fix updates golang.org/x/net to release-branch.go1.10
and golang.org/x/text to v0.3.0, for the purpose of
align with go version 1.10.

This fix also updates README.md to promote using go 1.10.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
---
 Makefile  | 4 ++--
 README.md | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 3b4857c86..28ea7a0c5 100644
--- a/Makefile
+++ b/Makefile
@@ -38,8 +38,8 @@ godeps:
 	(cd $(GOPATH)/src/github.com/mholt/caddy              && git checkout -q v0.10.11)
 	(cd $(GOPATH)/src/github.com/miekg/dns                && git checkout -q v1.0.4)
 	(cd $(GOPATH)/src/github.com/prometheus/client_golang && git checkout -q v0.8.0)
-	(cd $(GOPATH)/src/golang.org/x/net                    && git checkout -q release-branch.go1.9)
-	(cd $(GOPATH)/src/golang.org/x/text                   && git checkout -q e19ae1496984b1c655b8044a65c0300a3c878dd3)
+	(cd $(GOPATH)/src/golang.org/x/net                    && git checkout -q release-branch.go1.10)
+	(cd $(GOPATH)/src/golang.org/x/text                   && git checkout -q v0.3.0)
 
 .PHONY: travis
 travis: check
diff --git a/README.md b/README.md
index 91ce4bc32..a00c84892 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,7 @@ a Go environment, you could build CoreDNS easily:
 
 ```
 $ docker run --rm -i -t -v $PWD:/go/src/github.com/coredns/coredns \
-      -w /go/src/github.com/coredns/coredns golang:1.9 make
+      -w /go/src/github.com/coredns/coredns golang:1.10 make
 ```
 
 The above command alone will have `coredns` binary generated.