Skip to content

Merge from master into Firebase #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sarvaniv merged 35 commits into from
Mar 13, 2017
Merged

Merge from master into Firebase #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
efa1dac
Fixed bazel install
sebastienvas Jan 10, 2017
315d072
Make docker slaves consistent with jenkinsci/slave
sebastienvas Jan 11, 2017
b76ea58
Align with latest istio/proxy. (#73)
chowchow316 Jan 12, 2017
8784e6a
Support HEAD request in transcoding (#74)
lizan Jan 14, 2017
3ed9393
Fixing bazel install for ubuntu salve
sebastienvas Jan 11, 2017
feda7e0
Use open-sourced scripts (#76)
kyessenov Jan 24, 2017
f284736
Update to istio/proxy with mixer_client integration. (#78)
qiwzhang Jan 27, 2017
007bf0f
Align with istio/proxy. (#79)
chowchow316 Jan 31, 2017
53abde6
Fix debian jessie package issue
sebastienvas Feb 2, 2017
8c26e96
Fixes typo in script
sebastienvas Feb 2, 2017
f9c1022
Modify test justification. (#83)
chowchow316 Feb 3, 2017
60b0ad0
Update NGINX to 1.11.9 (#75)
lizan Feb 6, 2017
07bf526
Remove mixer_client repo. (#85)
qiwzhang Feb 8, 2017
6d65f0e
Revert "Update NGINX to 1.11.9" (#86)
lizan Feb 8, 2017
1db5da6
Use grpc-go for interop tests (#88)
lizan Feb 13, 2017
d22d561
fix grpc docker build script (#90)
lizan Feb 13, 2017
9617591
Upgrade bazel to 0.4.4 (#92)
lizan Feb 14, 2017
8d42ba1
Update istio/proxy for GRPC v1.1.1 (#89)
lizan Feb 14, 2017
85b73ca
Fix ProxyFlow leak (#93)
lizan Feb 14, 2017
ac8708b
Basic GRPC request compression support (#94)
lizan Feb 15, 2017
3cb2548
Remove undefined flag of Go stress client (#95)
lizan Feb 16, 2017
7847760
t-test changes to check that x-endpoint-api-userinfo is received by g…
sarvaniv Feb 16, 2017
54d5686
Fix typo (#97)
sebastienvas Feb 16, 2017
1bee0c0
not to use api_key if service is not activated. (#98)
qiwzhang Feb 22, 2017
9c85906
Escape run description
sebastienvas Feb 11, 2017
220bd71
Fix grpc interop stress test script. (#103)
qiwzhang Feb 23, 2017
23958a9
try to escape json again. (#106)
qiwzhang Feb 23, 2017
e06ddf5
Add t test for fail wrong api key. (#104)
chowchow316 Feb 23, 2017
a6c8d3b
Allow grpc interop stress test fail once. (#105)
chowchow316 Feb 23, 2017
591f068
Update to latest endpoints-tool. (#110)
qiwzhang Feb 27, 2017
0fdaad9
Deprecate x-security (#101)
sarvaniv Feb 27, 2017
cd15ad4
Update CHANGELOG (#112)
kyessenov Mar 1, 2017
4961747
Update version number to 1.2.0. (#111)
kyessenov Mar 1, 2017
ca63cc2
Quick fix of bookstore-server race (#115)
lizan Mar 4, 2017
d7016a3
Merge branch 'master' of https://github.com/cloudendpoints/esp into m…
sarvaniv Mar 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#
# A Bazel (http://bazel.io) workspace for the Google Cloud Endpoints runtime.

ISTIO_PROXY = "df4b7e43aad8e8a25d83606389c41d06ecef32ac"
ISTIO_PROXY = "cfdb30323aa72b680bab1664035a1bbc200379c0"

git_repository(
name = "nginx",
Expand Down
3 changes: 3 additions & 0 deletions test/transcoding/bookstore-server.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include <algorithm>
#include <iostream>
#include <map>
#include <mutex>
#include <string>
#include <vector>

Expand All @@ -47,6 +48,8 @@ void PrintRequest(const MessageType& message) {
static ::google::protobuf::util::TypeResolver* type_resolver =
::google::protobuf::util::NewTypeResolverForDescriptorPool(
"type.googleapis.com", message.GetDescriptor()->file()->pool());
static std::mutex mutex;
std::lock_guard<std::mutex> lock(mutex);

std::string binary;
if (!message.SerializeToString(&binary)) {
Expand Down