From 13746e23c2892c6e6f09e9456eb6ce6d40db533b Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Mon, 7 May 2018 14:40:32 -0700 Subject: [PATCH] Update master submodule --- packages/grpc-native-core/binding.gyp | 1 - packages/grpc-native-core/deps/grpc | 2 +- packages/grpc-native-core/package.json | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/grpc-native-core/binding.gyp b/packages/grpc-native-core/binding.gyp index a7cbb8b7..67f5a2c3 100644 --- a/packages/grpc-native-core/binding.gyp +++ b/packages/grpc-native-core/binding.gyp @@ -900,7 +900,6 @@ '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', - 'deps/grpc/src/core/ext/filters/client_channel/lb_policy/subchannel_list.cc', 'deps/grpc/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc', 'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc', 'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc', diff --git a/packages/grpc-native-core/deps/grpc b/packages/grpc-native-core/deps/grpc index cc4fe1b3..aef95795 160000 --- a/packages/grpc-native-core/deps/grpc +++ b/packages/grpc-native-core/deps/grpc @@ -1 +1 @@ -Subproject commit cc4fe1b3cd5fea5c240e749e1f1f52f5aaab91a2 +Subproject commit aef957950aa3390e3516531ca2d783de8fc9333b diff --git a/packages/grpc-native-core/package.json b/packages/grpc-native-core/package.json index fff630f7..357c485c 100644 --- a/packages/grpc-native-core/package.json +++ b/packages/grpc-native-core/package.json @@ -1,6 +1,6 @@ { "name": "grpc", - "version": "1.12.0-dev", + "version": "1.13.0-dev", "author": "Google Inc.", "description": "gRPC Library for Node", "homepage": "https://grpc.io/",