Merge pull request #881 from murgatroid99/v1.21.0_update

Update to v1.21.0
grpc · May 22, 2019 · 25649ea · 25649ea
2 parents aa54c26 + 4940d05
commit 25649ea
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git 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.21.0-pre1"'
+      'GRPC_NODE_VERSION="1.21.0"'
     ],
     'defines!': [
       'OPENSSL_THREADS'
@@ -950,7 +950,6 @@
         'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc',
         '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/c_ares/grpc_ares_wrapper_libuv.cc',
-        'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_libuv_windows.cc',
         'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc',
         '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/dns_resolver_selection.cc',

diff --git a/packages/grpc-native-core/deps/grpc b/packages/grpc-native-core/deps/grpc
diff --git a/packages/grpc-native-core/package.json b/packages/grpc-native-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "grpc",
-  "version": "1.21.0-pre1",
+  "version": "1.21.0",
   "author": "Google Inc.",
   "description": "gRPC Library for Node",
   "homepage": "https://grpc.io/",
+1 −3		BUILD
+0 −2		BUILD.gn
+1 −3		CMakeLists.txt
+2 −4		Makefile
+1 −3		build.yaml
+0 −1		config.m4
+0 −1		config.w32
+4 −5		gRPC-C++.podspec
+1 −4		gRPC-Core.podspec
+1 −1		gRPC-ProtoRPC.podspec
+1 −1		gRPC-RxLibrary.podspec
+1 −1		gRPC.podspec
+0 −2		grpc.gemspec
+0 −2		grpc.gyp
+4 −6		package.xml
+1 −1		src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
+70 −0		src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc
+0 −8		src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h
+0 −13		src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_libuv.cc
+0 −83		src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_libuv_windows.cc
+0 −34		src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_libuv_windows.h
+0 −6		src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc
+2 −15		src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc
+2 −0		src/core/lib/iomgr/port.h
+1 −1		src/cpp/common/version_cc.cc
+1 −1		src/csharp/Grpc.Core.Api/VersionInfo.cs
+1 −1		src/csharp/build/dependencies.props
+1 −1		src/csharp/build_unitypackage.bat
+1 −1		src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
+1 −1		src/objective-c/GRPCClient/private/version.h
+1 −1		src/objective-c/tests/version.h
+1 −1		src/php/ext/grpc/version.h
+8 −0		src/python/grpcio/README.rst
+1 −1		src/python/grpcio/grpc/_grpcio_metadata.py
+0 −1		src/python/grpcio/grpc_core_dependencies.py
+1 −1		src/python/grpcio/grpc_version.py
+8 −0		src/python/grpcio_channelz/README.rst
+1 −1		src/python/grpcio_channelz/grpc_version.py
+4 −0		src/python/grpcio_channelz/setup.py
+8 −0		src/python/grpcio_health_checking/README.rst
+1 −1		src/python/grpcio_health_checking/grpc_version.py
+4 −0		src/python/grpcio_health_checking/setup.py
+8 −0		src/python/grpcio_reflection/README.rst
+1 −1		src/python/grpcio_reflection/grpc_version.py
+4 −0		src/python/grpcio_reflection/setup.py
+8 −0		src/python/grpcio_status/README.rst
+1 −1		src/python/grpcio_status/grpc_version.py
+4 −0		src/python/grpcio_status/setup.py
+8 −0		src/python/grpcio_testing/README.rst
+1 −1		src/python/grpcio_testing/grpc_version.py
+4 −0		src/python/grpcio_testing/setup.py
+1 −1		src/python/grpcio_tests/grpc_version.py
+1 −1		src/ruby/lib/grpc/version.rb
+1 −1		src/ruby/tools/version.rb
+2 −2		templates/gRPC-C++.podspec.template
+8 −0		tools/distrib/python/grpcio_tools/README.rst
+1 −1		tools/distrib/python/grpcio_tools/grpc_version.py
+4 −0		tools/distrib/python/grpcio_tools/setup.py
+1 −1		tools/doxygen/Doxyfile.c++
+1 −1		tools/doxygen/Doxyfile.c++.internal
+0 −2		tools/doxygen/Doxyfile.core.internal
+1 −4		tools/run_tests/generated/sources_and_headers.json