From a85225dd43fe6ea97da2e84b34f5b7cdd7c6a2c9 Mon Sep 17 00:00:00 2001 From: Tao Li Date: Fri, 10 Feb 2017 15:17:19 -0800 Subject: [PATCH 1/4] Fix src/envoy/mixer/README.md --- src/envoy/mixer/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/envoy/mixer/README.md b/src/envoy/mixer/README.md index 21f7403f77c..e881937a092 100644 --- a/src/envoy/mixer/README.md +++ b/src/envoy/mixer/README.md @@ -24,6 +24,8 @@ This Proxy will use Envoy and talk to Mixer server. ``` bazel-bin/cmd/server/mixs server + --globalConfigFile testdata/globalconfig.yml + --serviceConfigFile testdata/serviceconfig.yml --logtostderr ``` The server will run at port 9091 From 5a5eaf90248698904f374c37544e1ab70a78fd82 Mon Sep 17 00:00:00 2001 From: Tao Li Date: Wed, 1 Mar 2017 17:20:54 -0800 Subject: [PATCH 2/4] Update nghttp2 to sync with envoy --- src/envoy/repositories.bzl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/envoy/repositories.bzl b/src/envoy/repositories.bzl index 150f445015e..ca7e9468ded 100644 --- a/src/envoy/repositories.bzl +++ b/src/envoy/repositories.bzl @@ -431,8 +431,8 @@ cc_library( native.new_http_archive( name = "nghttp2_tar", - url = "https://github.com/nghttp2/nghttp2/releases/download/v1.14.1/nghttp2-1.14.1.tar.gz", - strip_prefix = "nghttp2-1.14.1", + url = "https://github.com/nghttp2/nghttp2/releases/download/v1.20.0/nghttp2-1.20.0.tar.gz", + strip_prefix = "nghttp2-1.20.0", build_file_content = BUILD, ) @@ -752,6 +752,6 @@ cc_test( native.new_git_repository( name = "envoy_git", remote = "https://github.com/lyft/envoy.git", - commit = "abef64f738d269f6c7f8265233d3ea377eef9596", # 2/16/2017 + commit = "70e5d651b55d356770529e5bee9c6b2707d9cf21", # 3/1/2017 build_file_content = BUILD, ) From 304fd333c8d6b1a0d43f3a2007df9f3dacdddfc2 Mon Sep 17 00:00:00 2001 From: Tao Li Date: Wed, 1 Mar 2017 18:23:36 -0800 Subject: [PATCH 3/4] update --- src/envoy/repositories.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/envoy/repositories.bzl b/src/envoy/repositories.bzl index ca7e9468ded..42b5ada25b1 100644 --- a/src/envoy/repositories.bzl +++ b/src/envoy/repositories.bzl @@ -432,7 +432,7 @@ cc_library( native.new_http_archive( name = "nghttp2_tar", url = "https://github.com/nghttp2/nghttp2/releases/download/v1.20.0/nghttp2-1.20.0.tar.gz", - strip_prefix = "nghttp2-1.20.0", + strip_prefix = "nghttp2-1.0.0", build_file_content = BUILD, ) From 9a7f1c10a0c97bf253156c489a7d24d12348c152 Mon Sep 17 00:00:00 2001 From: Tao Li Date: Wed, 1 Mar 2017 18:26:12 -0800 Subject: [PATCH 4/4] fix typo --- src/envoy/repositories.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/envoy/repositories.bzl b/src/envoy/repositories.bzl index 42b5ada25b1..ca7e9468ded 100644 --- a/src/envoy/repositories.bzl +++ b/src/envoy/repositories.bzl @@ -432,7 +432,7 @@ cc_library( native.new_http_archive( name = "nghttp2_tar", url = "https://github.com/nghttp2/nghttp2/releases/download/v1.20.0/nghttp2-1.20.0.tar.gz", - strip_prefix = "nghttp2-1.0.0", + strip_prefix = "nghttp2-1.20.0", build_file_content = BUILD, )