Updating submodule to the upstream 1.15 branch.

This commit is contained in:
Nicolas "Pixel" Noble 2018-08-29 01:45:51 +02:00
parent 8ba6c591e5
commit dda0d05642
3 changed files with 4 additions and 4 deletions

View File

@ -91,7 +91,7 @@
'GPR_BACKWARDS_COMPATIBILITY_MODE', 'GPR_BACKWARDS_COMPATIBILITY_MODE',
'GRPC_ARES=0', 'GRPC_ARES=0',
'GRPC_UV', 'GRPC_UV',
'GRPC_NODE_VERSION="1.15.0-dev"' 'GRPC_NODE_VERSION="1.15.0-pre1"'
], ],
'conditions': [ 'conditions': [
['grpc_gcov=="true"', { ['grpc_gcov=="true"', {
@ -929,7 +929,7 @@
'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc', 'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc',
'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc', 'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc',
'deps/grpc/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc', 'deps/grpc/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc',
'deps/grpc/src/cpp/ext/filters/census/grpc_context.cc', 'deps/grpc/src/core/ext/filters/census/grpc_context.cc',
'deps/grpc/src/core/ext/filters/max_age/max_age_filter.cc', 'deps/grpc/src/core/ext/filters/max_age/max_age_filter.cc',
'deps/grpc/src/core/ext/filters/message_size/message_size_filter.cc', 'deps/grpc/src/core/ext/filters/message_size/message_size_filter.cc',
'deps/grpc/src/core/ext/filters/http/client_authority_filter.cc', 'deps/grpc/src/core/ext/filters/http/client_authority_filter.cc',

@ -1 +1 @@
Subproject commit 8ba45636295019b101c1e9579423d4de41c4c59e Subproject commit 1e80f2a4b1ca41e77814306d4f0cf09d45641640

View File

@ -1,6 +1,6 @@
{ {
"name": "grpc", "name": "grpc",
"version": "1.15.0-dev", "version": "1.15.0-pre1",
"author": "Google Inc.", "author": "Google Inc.",
"description": "gRPC Library for Node", "description": "gRPC Library for Node",
"homepage": "https://grpc.io/", "homepage": "https://grpc.io/",