grpc
/
grpc-web
mirror of https://github.com/grpc/grpc-web.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #142 from stanley-cheung/master 

Update gRPC
This commit is contained in:
Stanley Cheung 2018-02-15 16:30:30 -08:00 committed by GitHub
parent af3e6fd563 e25c0dfb8f
commit 012621e5a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
net/grpc/gateway/nginx/grpc_gateway_module.c
View File

@ -26,7 +26,6 @@
#include "third_party/grpc/include/grpc/grpc.h"
#include "third_party/grpc/include/grpc/slice.h"
#include "third_party/grpc/include/grpc/status.h"
#include "third_party/grpc/include/grpc/support/thd.h"
#include "third_party/grpc/include/grpc/support/time.h"
// Tag for requests to GRPC backend. It contains the content and will be send

1
net/grpc/gateway/runtime/grpc_event_queue.cc
View File

@ -8,6 +8,7 @@
#include "net/grpc/gateway/runtime/tag.h"
#include "third_party/grpc/include/grpc/grpc.h"
#include "third_party/grpc/include/grpc/support/time.h"
#include "third_party/grpc/src/core/lib/gpr/thd.h"
namespace grpc {
namespace gateway {

2
net/grpc/gateway/runtime/grpc_event_queue.h
View File

@ -2,7 +2,7 @@
#define NET_GRPC_GATEWAY_RUNTIME_GRPC_EVENT_QUEUE_H_
#include "third_party/grpc/include/grpc/grpc.h"
#include "third_party/grpc/include/grpc/support/thd.h"
#include "third_party/grpc/include/grpc/support/thd_id.h"
namespace grpc {
namespace gateway {

2
scripts/init_submodules.sh
View File

@ -3,6 +3,6 @@ cd ..
git submodule update --init
cd third_party/closure-library && git checkout tags/v20171112 -f && cd ../..
cd third_party/openssl && git checkout tags/OpenSSL_1_0_2h -f && cd ../..
cd third_party/grpc && git checkout 0819ff5 -f && git submodule update --init && cd ../..
cd third_party/grpc && git checkout 8224c45 -f && git submodule update --init && cd ../..
cd scripts/

2
third_party/grpc vendored

@ -1 +1 @@
Subproject commit 0819ff56f5b7bed6a351db8913d7bb75be0e4d95
Subproject commit 8224c45866c6a2cfa29ede0c91a6ae9f40572658