From ee74f5cb438538a62cec57248178e7600f447218 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Tue, 19 Feb 2019 17:14:23 +0100 Subject: [PATCH 1/2] upgrade grpc/grpc submodule to freshest master --- packages/grpc-native-core/deps/grpc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/grpc-native-core/deps/grpc b/packages/grpc-native-core/deps/grpc index 4b7da8ab9..b3b5d6342 160000 --- a/packages/grpc-native-core/deps/grpc +++ b/packages/grpc-native-core/deps/grpc @@ -1 +1 @@ -Subproject commit 4b7da8ab961e57452b1459ce28e5f68398c62845 +Subproject commit b3b5d634231ce2c5c0ec0c557b6844e1a43b482e From 35c7697c64a03b2bb40f273afbf1b6d8c25c6b53 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Tue, 19 Feb 2019 17:16:23 +0100 Subject: [PATCH 2/2] regenerate projects --- packages/grpc-native-core/binding.gyp | 6 +++--- packages/grpc-native-core/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/grpc-native-core/binding.gyp b/packages/grpc-native-core/binding.gyp index 98ad85eb0..fe1e53475 100644 --- a/packages/grpc-native-core/binding.gyp +++ b/packages/grpc-native-core/binding.gyp @@ -91,7 +91,7 @@ 'GPR_BACKWARDS_COMPATIBILITY_MODE', 'GRPC_ARES=0', 'GRPC_UV', - 'GRPC_NODE_VERSION="1.19.0-dev"' + 'GRPC_NODE_VERSION="1.20.0-dev"' ], 'conditions': [ ['grpc_gcov=="true"', { @@ -632,7 +632,6 @@ 'deps/grpc/src/core/lib/channel/channelz_registry.cc', 'deps/grpc/src/core/lib/channel/connected_channel.cc', 'deps/grpc/src/core/lib/channel/handshaker.cc', - 'deps/grpc/src/core/lib/channel/handshaker_factory.cc', 'deps/grpc/src/core/lib/channel/handshaker_registry.cc', 'deps/grpc/src/core/lib/channel/status_util.cc', 'deps/grpc/src/core/lib/compression/compression.cc', @@ -821,6 +820,7 @@ 'deps/grpc/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc', 'deps/grpc/src/core/lib/security/credentials/plugin/plugin_credentials.cc', 'deps/grpc/src/core/lib/security/credentials/ssl/ssl_credentials.cc', + 'deps/grpc/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc', 'deps/grpc/src/core/lib/security/security_connector/alts/alts_security_connector.cc', 'deps/grpc/src/core/lib/security/security_connector/fake/fake_security_connector.cc', 'deps/grpc/src/core/lib/security/security_connector/load_system_roots_fallback.cc', @@ -893,10 +893,10 @@ 'deps/grpc/src/core/ext/filters/client_channel/parse_address.cc', 'deps/grpc/src/core/ext/filters/client_channel/proxy_mapper.cc', 'deps/grpc/src/core/ext/filters/client_channel/proxy_mapper_registry.cc', - 'deps/grpc/src/core/ext/filters/client_channel/request_routing.cc', 'deps/grpc/src/core/ext/filters/client_channel/resolver.cc', 'deps/grpc/src/core/ext/filters/client_channel/resolver_registry.cc', 'deps/grpc/src/core/ext/filters/client_channel/resolver_result_parsing.cc', + 'deps/grpc/src/core/ext/filters/client_channel/resolving_lb_policy.cc', 'deps/grpc/src/core/ext/filters/client_channel/retry_throttle.cc', 'deps/grpc/src/core/ext/filters/client_channel/server_address.cc', 'deps/grpc/src/core/ext/filters/client_channel/subchannel.cc', diff --git a/packages/grpc-native-core/package.json b/packages/grpc-native-core/package.json index 0cdad4397..e6fc746c9 100644 --- a/packages/grpc-native-core/package.json +++ b/packages/grpc-native-core/package.json @@ -1,6 +1,6 @@ { "name": "grpc", - "version": "1.19.0-dev", + "version": "1.20.0-dev", "author": "Google Inc.", "description": "gRPC Library for Node", "homepage": "https://grpc.io/",