From d71dd337ef1bdee470dc67d3ca7c1f8d64ef9dbd Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Thu, 26 Jul 2018 01:33:16 +0200 Subject: [PATCH] Updating submodule to 1.14.x --- packages/grpc-native-core/binding.gyp | 10 +++++++--- packages/grpc-native-core/deps/grpc | 2 +- packages/grpc-native-core/package.json | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/packages/grpc-native-core/binding.gyp b/packages/grpc-native-core/binding.gyp index b52892ac..88e71c28 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.14.0-dev"' + 'GRPC_NODE_VERSION="1.14.0-pre1"' ], 'conditions': [ ['grpc_gcov=="true"', { @@ -815,10 +815,12 @@ 'deps/grpc/src/core/lib/security/credentials/jwt/json_token.cc', 'deps/grpc/src/core/lib/security/credentials/jwt/jwt_credentials.cc', 'deps/grpc/src/core/lib/security/credentials/jwt/jwt_verifier.cc', + 'deps/grpc/src/core/lib/security/credentials/local/local_credentials.cc', '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/security_connector/alts_security_connector.cc', + 'deps/grpc/src/core/lib/security/security_connector/local_security_connector.cc', 'deps/grpc/src/core/lib/security/security_connector/security_connector.cc', 'deps/grpc/src/core/lib/security/transport/client_auth_filter.cc', 'deps/grpc/src/core/lib/security/transport/secure_endpoint.cc', @@ -870,6 +872,7 @@ 'deps/grpc/src/core/ext/filters/client_channel/backup_poller.cc', 'deps/grpc/src/core/ext/filters/client_channel/channel_connectivity.cc', 'deps/grpc/src/core/ext/filters/client_channel/client_channel.cc', + 'deps/grpc/src/core/ext/filters/client_channel/client_channel_channelz.cc', 'deps/grpc/src/core/ext/filters/client_channel/client_channel_factory.cc', 'deps/grpc/src/core/ext/filters/client_channel/client_channel_plugin.cc', 'deps/grpc/src/core/ext/filters/client_channel/connector.cc', @@ -891,6 +894,7 @@ 'deps/grpc/src/core/ext/filters/deadline/deadline_filter.cc', 'deps/grpc/src/core/tsi/alts_transport_security.cc', 'deps/grpc/src/core/tsi/fake_transport_security.cc', + 'deps/grpc/src/core/tsi/local_transport_security.cc', 'deps/grpc/src/core/tsi/ssl/session_cache/ssl_session_boringssl.cc', 'deps/grpc/src/core/tsi/ssl/session_cache/ssl_session_cache.cc', 'deps/grpc/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc', @@ -907,6 +911,8 @@ 'deps/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc', 'deps/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc', 'deps/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc', + 'deps/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/duration.pb.c', + 'deps/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/timestamp.pb.c', 'deps/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c', 'deps/grpc/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc', 'deps/grpc/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc', @@ -918,8 +924,6 @@ 'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.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/load_reporting/server_load_reporting_filter.cc', - 'deps/grpc/src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc', 'deps/grpc/src/cpp/ext/filters/census/grpc_context.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', diff --git a/packages/grpc-native-core/deps/grpc b/packages/grpc-native-core/deps/grpc index 05628719..768e8ea8 160000 --- a/packages/grpc-native-core/deps/grpc +++ b/packages/grpc-native-core/deps/grpc @@ -1 +1 @@ -Subproject commit 05628719f1c8d21969ddb700df05b4c63982b66a +Subproject commit 768e8ea89c9d27ea05b86cd83b0bfd18643bce12 diff --git a/packages/grpc-native-core/package.json b/packages/grpc-native-core/package.json index 6af7e78c..4e40a70d 100644 --- a/packages/grpc-native-core/package.json +++ b/packages/grpc-native-core/package.json @@ -1,6 +1,6 @@ { "name": "grpc", - "version": "1.14.0-dev", + "version": "1.14.0-pre1", "author": "Google Inc.", "description": "gRPC Library for Node", "homepage": "https://grpc.io/",