Merge branch 'v1.5' into master

2018-02-27 14:07:07 +01:00
parent 6f81e3479a 422109b82f
commit a2db3e0499
18 changed files with 684 additions and 486 deletions
--- a/integration/helloworld/helloworld.pb.go
+++ b/integration/helloworld/helloworld.pb.go
@@ -20,7 +20,8 @@ import fmt "fmt"
 import math "math"

 import (
-	context "golang.org/x/net/context"
+	context "context"
+
 	grpc "google.golang.org/grpc"
 )