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 #582 from nicolasnoble/1.16-submodule 

Properly updating submodule to point at 1.16.
This commit is contained in:
Nicolas Noble 2018-10-23 14:02:13 -07:00 committed by GitHub
parent 65cd6bafd3 34219900a9
commit 0d1d1feb78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
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.15.0-dev"'
'GRPC_NODE_VERSION="1.16.0-pre1"'
],
'conditions': [
['grpc_gcov=="true"', {
@ -648,6 +648,7 @@
'deps/grpc/src/core/lib/http/format_request.cc',
'deps/grpc/src/core/lib/http/httpcli.cc',
'deps/grpc/src/core/lib/http/parser.cc',
'deps/grpc/src/core/lib/iomgr/buffer_list.cc',
'deps/grpc/src/core/lib/iomgr/call_combiner.cc',
'deps/grpc/src/core/lib/iomgr/combiner.cc',
'deps/grpc/src/core/lib/iomgr/endpoint.cc',
@ -657,7 +658,6 @@
'deps/grpc/src/core/lib/iomgr/error.cc',
'deps/grpc/src/core/lib/iomgr/ev_epoll1_linux.cc',
'deps/grpc/src/core/lib/iomgr/ev_epollex_linux.cc',
'deps/grpc/src/core/lib/iomgr/ev_epollsig_linux.cc',
'deps/grpc/src/core/lib/iomgr/ev_poll_posix.cc',
'deps/grpc/src/core/lib/iomgr/ev_posix.cc',
'deps/grpc/src/core/lib/iomgr/ev_windows.cc',
@ -668,6 +668,7 @@
'deps/grpc/src/core/lib/iomgr/gethostname_fallback.cc',
'deps/grpc/src/core/lib/iomgr/gethostname_host_name_max.cc',
'deps/grpc/src/core/lib/iomgr/gethostname_sysconf.cc',
'deps/grpc/src/core/lib/iomgr/internal_errqueue.cc',
'deps/grpc/src/core/lib/iomgr/iocp_windows.cc',
'deps/grpc/src/core/lib/iomgr/iomgr.cc',
'deps/grpc/src/core/lib/iomgr/iomgr_custom.cc',
@ -929,7 +930,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/native/dns_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/message_size/message_size_filter.cc',
'deps/grpc/src/core/ext/filters/http/client_authority_filter.cc',

1
packages/grpc-native-core/build.yaml
View File

@ -1,2 +1,3 @@
settings:
'#': It's possible to have node_version here as a key to override the core's version.
node_version: 1.16.0-pre1

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

@ -1 +1 @@
Subproject commit 8ba45636295019b101c1e9579423d4de41c4c59e
Subproject commit 98457b76ff43efa2c3edd203c14cd923734d5279

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

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