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

Merge pull request #586 from murgatroid99/master_submodule_update_1.17-dev 

Update grpc submodule to HEAD
This commit is contained in:
Nicolas Noble 2018-10-24 18:46:14 -07:00 committed by GitHub
parent 2dbdd09670 14a1f8520c
commit 7768e7b6e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/grpc-native-core/binding.gyp
View File

@ -91,7 +91,7 @@
'GPR_BACKWARDS_COMPATIBILITY_MODE',
'GRPC_ARES=0',
'GRPC_UV',
'GRPC_NODE_VERSION="1.16.0-pre1"'
'GRPC_NODE_VERSION="1.17.0-dev"'
],
'conditions': [
['grpc_gcov=="true"', {
@ -912,10 +912,14 @@
'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/resolver/fake/fake_resolver.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/xds/xds.cc',
'deps/grpc/src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_secure.cc',
'deps/grpc/src/core/ext/filters/client_channel/lb_policy/xds/xds_client_stats.cc',
'deps/grpc/src/core/ext/filters/client_channel/lb_policy/xds/xds_load_balancer_api.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/round_robin/round_robin.cc',
'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc',

2
packages/grpc-native-core/deps/grpc

@ -1 +1 @@
Subproject commit bc9e9ddf9e04b1a905d51c41b1ffef5b30f2c986
Subproject commit 5984e9daf26123bab25279f74e43d60908f199bf

2
packages/grpc-native-core/package.json
View File

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