From c0c62b0fb2c11810ff9f1c2687e944b25fa62f77 Mon Sep 17 00:00:00 2001
From: Alexey Palazhchenko <alexey.palazhchenko@gmail.com>
Date: Thu, 14 Sep 2017 01:39:41 +0300
Subject: [PATCH 1/3] Test with Go 1.9.

---
 .travis.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 37d1b5468e7..312a9b818cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,10 @@
 language: go
 sudo: false
 go:
-- 1.8.x
 - 1.7.x
-- tip
+- 1.8.x
+- 1.9.x
+- master
 go_import_path: github.com/grpc-ecosystem/grpc-gateway
 cache:
   directories:

From 6e5940f2fe88ab2c4a94abb8144d0fd7392f30f3 Mon Sep 17 00:00:00 2001
From: Alexey Palazhchenko <alexey.palazhchenko@gmail.com>
Date: Thu, 14 Sep 2017 01:58:50 +0300
Subject: [PATCH 2/3] Fix build.

See grpc/grpc-go#1392.
---
 examples/server/a_bit_of_everything.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/server/a_bit_of_everything.go b/examples/server/a_bit_of_everything.go
index 190d0f85309..38c6467c54e 100644
--- a/examples/server/a_bit_of_everything.go
+++ b/examples/server/a_bit_of_everything.go
@@ -134,7 +134,7 @@ func (s *_ABitOfEverythingServer) List(_ *empty.Empty, stream examples.StreamSer
 	}
 
 	// return error when metadata includes error header
-	if header, ok := metadata.FromContext(stream.Context()); ok {
+	if header, ok := metadata.FromIncomingContext(stream.Context()); ok {
 		if v, ok := header["error"]; ok {
 			stream.SetTrailer(metadata.New(map[string]string{
 				"foo": "foo2",

From be95813fdfa541dba6d54d1d32cf16f241fdaecf Mon Sep 17 00:00:00 2001
From: Andrew Z Allen <github@achew22.com>
Date: Wed, 13 Sep 2017 21:55:05 -0600
Subject: [PATCH 3/3] Reference Gulp by a more complete path

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 312a9b818cd..9ca6f5d7020 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@ script:
 - if (go version | grep -q 1.8) && [ -z "${GATEWAY_PLUGIN_FLAGS}" ]; then test -z "$(git status --porcelain)" || (git status; git diff; exit 1); fi
 - env GLOG_logtostderr=1 go test -race -v github.com/grpc-ecosystem/grpc-gateway/...
 - make lint
-- sh -c 'cd examples/browser && gulp'
+- sh -c 'cd examples/browser && node ./node_modules/gulp/bin/gulp'
 env:
   global:
   - "PATH=$PATH:$HOME/local/bin"