fix test failures. (istio#347)

qiwzhang · web-flow · commit 0f25dc815075 · 2017-06-01T15:02:49.000-07:00
* fix test failures.

* fixed mixer sha
diff --git a/src/envoy/mixer/integration_test/repositories.bzl b/src/envoy/mixer/integration_test/repositories.bzl
@@ -139,7 +139,7 @@ gogoslick_proto_library(
       native.new_git_repository(
           name = "com_github_istio_api",
           build_file_content = ISTIO_API_BUILD_FILE,
-          commit = "972765388bbadfeb8d57a707a0576748a59aa80c",  # top of unary branch.
+          commit = "8edd0f7d57cd336ed8acd7ada91ffd4ef5f2a1c4",
           remote = "https://github.com/istio/api.git",
       )
 
@@ -211,6 +211,6 @@ def go_mixer_repositories(use_local_api=False):
 
     go_repository(
         name = "com_github_istio_mixer",
-        commit = "0ad9fa3aca4063f050f829338b06abdf9977ac75",
+        commit = "a6bfb91da1325908fa8084dbe06486436e14f0ce",
         importpath = "github.com/istio/mixer",
     )
diff --git a/src/envoy/mixer/repositories.bzl b/src/envoy/mixer/repositories.bzl
@@ -15,7 +15,7 @@
 ################################################################################
 #
 
-MIXER_CLIENT = "42fe370f677f45693ecb2d6e42b41db914d75592"
+MIXER_CLIENT = "7c9a3f8b66d8d909eef27d1d7ff358e16b0f9845"
 
 def mixer_client_repositories(bind=True):
     native.git_repository(

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ gogoslick_proto_library(`
`139`	`139`	`native.new_git_repository(`
`140`	`140`	`name = "com_github_istio_api",`
`141`	`141`	`build_file_content = ISTIO_API_BUILD_FILE,`
`142`		`- commit = "972765388bbadfeb8d57a707a0576748a59aa80c", # top of unary branch.`
	`142`	`+ commit = "8edd0f7d57cd336ed8acd7ada91ffd4ef5f2a1c4",`
`143`	`143`	`remote = "https://github.com/istio/api.git",`
`144`	`144`	`)`
`145`	`145`
`@@ -211,6 +211,6 @@ def go_mixer_repositories(use_local_api=False):`
`211`	`211`
`212`	`212`	`go_repository(`
`213`	`213`	`name = "com_github_istio_mixer",`
`214`		`- commit = "0ad9fa3aca4063f050f829338b06abdf9977ac75",`
	`214`	`+ commit = "a6bfb91da1325908fa8084dbe06486436e14f0ce",`
`215`	`215`	`importpath = "github.com/istio/mixer",`
`216`	`216`	`)`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`################################################################################`
`16`	`16`	`#`
`17`	`17`
`18`		`-MIXER_CLIENT = "42fe370f677f45693ecb2d6e42b41db914d75592"`
	`18`	`+MIXER_CLIENT = "7c9a3f8b66d8d909eef27d1d7ff358e16b0f9845"`
`19`	`19`
`20`	`20`	`def mixer_client_repositories(bind=True):`
`21`	`21`	`native.git_repository(`