Imported Upstream version 1.36.1

diff --git a/BUILD b/BUILD
index cfb7cce..d750df4 100644 (file)
--- a/BUILD
+++ b/BUILD
@@ -89,7 +89,7 @@ g_stands_for = "gummybear"  # @unused
 
 core_version = "15.0.0"  # @unused
 
-version = "1.36.0"  # @unused
+version = "1.36.1"  # @unused
 
 GPR_PUBLIC_HDRS = [
     "include/grpc/support/alloc.h",

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ce6a9a2..5d94ef7 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,12 +25,12 @@
 cmake_minimum_required(VERSION 3.5.1)
 
 set(PACKAGE_NAME          "grpc")
-set(PACKAGE_VERSION       "1.36.0")
+set(PACKAGE_VERSION       "1.36.1")
 set(gRPC_CORE_VERSION     "15.0.0")
 set(gRPC_CORE_SOVERSION   "15")
-set(gRPC_CPP_VERSION      "1.36.0")
+set(gRPC_CPP_VERSION      "1.36.1")
 set(gRPC_CPP_SOVERSION    "1")
-set(gRPC_CSHARP_VERSION   "2.36.0")
+set(gRPC_CSHARP_VERSION   "2.36.1")
 set(gRPC_CSHARP_SOVERSION "2")
 set(PACKAGE_STRING        "${PACKAGE_NAME} ${PACKAGE_VERSION}")
 set(PACKAGE_TARNAME       "${PACKAGE_NAME}-${PACKAGE_VERSION}")

diff --git a/Makefile b/Makefile
index 10e679c..53c4ece 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -455,8 +455,8 @@ Q = @
 endif
 
 CORE_VERSION = 15.0.0
-CPP_VERSION = 1.36.0
-CSHARP_VERSION = 2.36.0
+CPP_VERSION = 1.36.1
+CSHARP_VERSION = 2.36.1
 
 CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
 CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)

diff --git a/build_handwritten.yaml b/build_handwritten.yaml
index d7d6b8b..893e7ed 100644 (file)
--- a/build_handwritten.yaml
+++ b/build_handwritten.yaml
@@ -16,7 +16,7 @@ settings:
   csharp_major_version: 2
   g_stands_for: gummybear
   protobuf_version: 3.14.0
-  version: 1.36.0
+  version: 1.36.1
 targets:
 - name: check_epollexclusive
   build: tool

diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec
index fbd762d..35dde60 100644 (file)
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@@ -22,7 +22,7 @@
 Pod::Spec.new do |s|
   s.name     = 'gRPC-C++'
   # TODO (mxyan): use version that match gRPC version when pod is stabilized
-  version = '1.36.0'
+  version = '1.36.1'
   s.version  = version
   s.summary  = 'gRPC C++ library'
   s.homepage = 'https://grpc.io'

diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
index 26c84ad..61e385a 100644 (file)
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -21,7 +21,7 @@
 
 Pod::Spec.new do |s|
   s.name     = 'gRPC-Core'
-  version = '1.36.0'
+  version = '1.36.1'
   s.version  = version
   s.summary  = 'Core cross-platform gRPC library, written in C'
   s.homepage = 'https://grpc.io'

diff --git a/gRPC-ProtoRPC.podspec b/gRPC-ProtoRPC.podspec
index a7b1562..5e68850 100644 (file)
--- a/gRPC-ProtoRPC.podspec
+++ b/gRPC-ProtoRPC.podspec
@@ -21,7 +21,7 @@
 
 Pod::Spec.new do |s|
   s.name     = 'gRPC-ProtoRPC'
-  version = '1.36.0'
+  version = '1.36.1'
   s.version  = version
   s.summary  = 'RPC library for Protocol Buffers, based on gRPC'
   s.homepage = 'https://grpc.io'

diff --git a/gRPC-RxLibrary.podspec b/gRPC-RxLibrary.podspec
index 150880b..a4d22e5 100644 (file)
--- a/gRPC-RxLibrary.podspec
+++ b/gRPC-RxLibrary.podspec
@@ -21,7 +21,7 @@
 
 Pod::Spec.new do |s|
   s.name     = 'gRPC-RxLibrary'
-  version = '1.36.0'
+  version = '1.36.1'
   s.version  = version
   s.summary  = 'Reactive Extensions library for iOS/OSX.'
   s.homepage = 'https://grpc.io'

diff --git a/gRPC.podspec b/gRPC.podspec
index 7892daf..1d5adce 100644 (file)
--- a/gRPC.podspec
+++ b/gRPC.podspec
@@ -20,7 +20,7 @@
 
 Pod::Spec.new do |s|
   s.name     = 'gRPC'
-  version = '1.36.0'
+  version = '1.36.1'
   s.version  = version
   s.summary  = 'gRPC client library for iOS/OSX'
   s.homepage = 'https://grpc.io'

diff --git a/package.xml b/package.xml
index 33d996d..ef50304 100644 (file)
--- a/package.xml
+++ b/package.xml
@@ -13,8 +13,8 @@
  <date>2019-09-24</date>
  <time>16:06:07</time>
  <version>
-  <release>1.36.0</release>
-  <api>1.36.0</api>
+  <release>1.36.1</release>
+  <api>1.36.1</api>
  </version>
  <stability>
   <release>stable</release>
@@ -22,7 +22,7 @@
  </stability>
  <license>Apache 2.0</license>
  <notes>
-- gRPC Core 1.36.0 update
+- gRPC Core 1.36.1 update
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">

diff --git a/src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc b/src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc
index 424115d..7200237 100644 (file)
--- a/src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc
+++ b/src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc
@@ -19,6 +19,7 @@
 #include "src/core/ext/filters/client_channel/resolver_registry.h"
 #include "src/core/ext/xds/xds_client.h"
 #include "src/core/lib/gpr/env.h"
+#include "src/core/lib/gpr/string.h"
 #include "src/core/lib/http/httpcli.h"
 #include "src/core/lib/iomgr/polling_entity.h"
 #include "src/core/lib/security/credentials/alts/check_gcp_environment.h"
@@ -353,8 +354,14 @@ class GoogleCloud2ProdResolverFactory : public ResolverFactory {
 }  // namespace
 
 void GoogleCloud2ProdResolverInit() {
-  ResolverRegistry::Builder::RegisterResolverFactory(
-      absl::make_unique<GoogleCloud2ProdResolverFactory>());
+  // TODO(roth): Remove env var protection once this code is proven stable.
+  UniquePtr<char> value(gpr_getenv("GRPC_EXPERIMENTAL_GOOGLE_C2P_RESOLVER"));
+  bool parsed_value;
+  bool parse_succeeded = gpr_parse_bool_value(value.get(), &parsed_value);
+  if (parse_succeeded && parsed_value) {
+    ResolverRegistry::Builder::RegisterResolverFactory(
+        absl::make_unique<GoogleCloud2ProdResolverFactory>());
+  }
 }
 
 void GoogleCloud2ProdResolverShutdown() {}

diff --git a/src/cpp/common/version_cc.cc b/src/cpp/common/version_cc.cc
index 90ecd06..f1db752 100644 (file)
--- a/src/cpp/common/version_cc.cc
+++ b/src/cpp/common/version_cc.cc
@@ -22,5 +22,5 @@
 #include <grpcpp/grpcpp.h>
 
 namespace grpc {
-std::string Version() { return "1.36.0"; }
+std::string Version() { return "1.36.1"; }
 }  // namespace grpc

diff --git a/src/csharp/Grpc.Core.Api/VersionInfo.cs b/src/csharp/Grpc.Core.Api/VersionInfo.cs
index 0d25e75..3388518 100644 (file)
--- a/src/csharp/Grpc.Core.Api/VersionInfo.cs
+++ b/src/csharp/Grpc.Core.Api/VersionInfo.cs
@@ -33,11 +33,11 @@ namespace Grpc.Core
         /// <summary>
         /// Current <c>AssemblyFileVersion</c> of gRPC C# assemblies
         /// </summary>
-        public const string CurrentAssemblyFileVersion = "2.36.0.0";
+        public const string CurrentAssemblyFileVersion = "2.36.1.0";
 
         /// <summary>
         /// Current version of gRPC C#
         /// </summary>
-        public const string CurrentVersion = "2.36.0";
+        public const string CurrentVersion = "2.36.1";
     }
 }

diff --git a/src/csharp/build/dependencies.props b/src/csharp/build/dependencies.props
index c9a343c..3dd40e2 100644 (file)
--- a/src/csharp/build/dependencies.props
+++ b/src/csharp/build/dependencies.props
@@ -1,7 +1,7 @@
 <!-- This file is generated -->
 <Project>
   <PropertyGroup>
-    <GrpcCsharpVersion>2.36.0</GrpcCsharpVersion>
+    <GrpcCsharpVersion>2.36.1</GrpcCsharpVersion>
     <GoogleProtobufVersion>3.14.0</GoogleProtobufVersion>
   </PropertyGroup>
 </Project>

diff --git a/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec b/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec
index d5c29dc..2744352 100644 (file)
--- a/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec
+++ b/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec
@@ -42,7 +42,7 @@ Pod::Spec.new do |s|
   # exclamation mark ensures that other "regular" pods will be able to find it as it'll be installed
   # before them.
   s.name     = '!ProtoCompiler-gRPCCppPlugin'
-  v = '1.36.0'
+  v = '1.36.1'
   s.version  = v
   s.summary  = 'The gRPC ProtoC plugin generates C++ files from .proto services.'
   s.description = <<-DESC

diff --git a/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec b/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
index 9263cae..34ad3b7 100644 (file)
--- a/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
+++ b/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
@@ -42,7 +42,7 @@ Pod::Spec.new do |s|
   # exclamation mark ensures that other "regular" pods will be able to find it as it'll be installed
   # before them.
   s.name     = '!ProtoCompiler-gRPCPlugin'
-  v = '1.36.0'
+  v = '1.36.1'
   s.version  = v
   s.summary  = 'The gRPC ProtoC plugin generates Objective-C files from .proto services.'
   s.description = <<-DESC

diff --git a/src/objective-c/GRPCClient/version.h b/src/objective-c/GRPCClient/version.h
index b034fdc..21a34ae 100644 (file)
--- a/src/objective-c/GRPCClient/version.h
+++ b/src/objective-c/GRPCClient/version.h
@@ -22,4 +22,4 @@
 // instead. This file can be regenerated from the template by running
 // `tools/buildgen/generate_projects.sh`.
 
-#define GRPC_OBJC_VERSION_STRING @"1.36.0"
+#define GRPC_OBJC_VERSION_STRING @"1.36.1"

diff --git a/src/objective-c/tests/version.h b/src/objective-c/tests/version.h
index 5c22c82..26ea0bc 100644 (file)
--- a/src/objective-c/tests/version.h
+++ b/src/objective-c/tests/version.h
@@ -22,5 +22,5 @@
 // instead. This file can be regenerated from the template by running
 // `tools/buildgen/generate_projects.sh`.
 
-#define GRPC_OBJC_VERSION_STRING @"1.36.0"
+#define GRPC_OBJC_VERSION_STRING @"1.36.1"
 #define GRPC_C_VERSION_STRING @"15.0.0"

diff --git a/src/php/composer.json b/src/php/composer.json
index 6ba2c16..e879976 100644 (file)
--- a/src/php/composer.json
+++ b/src/php/composer.json
@@ -2,7 +2,7 @@
   "name": "grpc/grpc-dev",
   "description": "gRPC library for PHP - for Development use only",
   "license": "Apache-2.0",
-  "version": "1.36.0",
+  "version": "1.36.1",
   "require": {
     "php": ">=7.0.0",
     "google/protobuf": "^v3.3.0"

diff --git a/src/php/ext/grpc/version.h b/src/php/ext/grpc/version.h
index 4f565dc..d671c00 100644 (file)
--- a/src/php/ext/grpc/version.h
+++ b/src/php/ext/grpc/version.h
@@ -20,6 +20,6 @@
 #ifndef VERSION_H
 #define VERSION_H
 
-#define PHP_GRPC_VERSION "1.36.0"
+#define PHP_GRPC_VERSION "1.36.1"
 
 #endif /* VERSION_H */

diff --git a/src/python/grpcio/grpc/_grpcio_metadata.py b/src/python/grpcio/grpc/_grpcio_metadata.py
index 112f394..be8b986 100644 (file)
--- a/src/python/grpcio/grpc/_grpcio_metadata.py
+++ b/src/python/grpcio/grpc/_grpcio_metadata.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc/_grpcio_metadata.py.template`!!!
 
-__version__ = """1.36.0"""
+__version__ = """1.36.1"""

diff --git a/src/python/grpcio/grpc_version.py b/src/python/grpcio/grpc_version.py
index 344d3e0..7f59e27 100644 (file)
--- a/src/python/grpcio/grpc_version.py
+++ b/src/python/grpcio/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc_version.py.template`!!!
 
-VERSION = '1.36.0'
+VERSION = '1.36.1'

diff --git a/src/python/grpcio_channelz/grpc_version.py b/src/python/grpcio_channelz/grpc_version.py
index 2a46c80..9289603 100644 (file)
--- a/src/python/grpcio_channelz/grpc_version.py
+++ b/src/python/grpcio_channelz/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_channelz/grpc_version.py.template`!!!
 
-VERSION = '1.36.0'
+VERSION = '1.36.1'

diff --git a/src/python/grpcio_health_checking/grpc_version.py b/src/python/grpcio_health_checking/grpc_version.py
index f11a08b..8797d68 100644 (file)
--- a/src/python/grpcio_health_checking/grpc_version.py
+++ b/src/python/grpcio_health_checking/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_health_checking/grpc_version.py.template`!!!
 
-VERSION = '1.36.0'
+VERSION = '1.36.1'

diff --git a/src/python/grpcio_reflection/grpc_version.py b/src/python/grpcio_reflection/grpc_version.py
index 099fb9b..9234f72 100644 (file)
--- a/src/python/grpcio_reflection/grpc_version.py
+++ b/src/python/grpcio_reflection/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_reflection/grpc_version.py.template`!!!
 
-VERSION = '1.36.0'
+VERSION = '1.36.1'

diff --git a/src/python/grpcio_status/grpc_version.py b/src/python/grpcio_status/grpc_version.py
index b254257..a5b9c4e 100644 (file)
--- a/src/python/grpcio_status/grpc_version.py
+++ b/src/python/grpcio_status/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_status/grpc_version.py.template`!!!
 
-VERSION = '1.36.0'
+VERSION = '1.36.1'

diff --git a/src/python/grpcio_testing/grpc_version.py b/src/python/grpcio_testing/grpc_version.py
index e287185..662fd7b 100644 (file)
--- a/src/python/grpcio_testing/grpc_version.py
+++ b/src/python/grpcio_testing/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_testing/grpc_version.py.template`!!!
 
-VERSION = '1.36.0'
+VERSION = '1.36.1'

diff --git a/src/python/grpcio_tests/grpc_version.py b/src/python/grpcio_tests/grpc_version.py
index eb83223..bb6c1dc 100644 (file)
--- a/src/python/grpcio_tests/grpc_version.py
+++ b/src/python/grpcio_tests/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_tests/grpc_version.py.template`!!!
 
-VERSION = '1.36.0'
+VERSION = '1.36.1'

diff --git a/src/ruby/lib/grpc/version.rb b/src/ruby/lib/grpc/version.rb
index 7cc7348..1d06b07 100644 (file)
--- a/src/ruby/lib/grpc/version.rb
+++ b/src/ruby/lib/grpc/version.rb
@@ -14,5 +14,5 @@
 
 # GRPC contains the General RPC module.
 module GRPC
-  VERSION = '1.36.0'
+  VERSION = '1.36.1'
 end

diff --git a/src/ruby/spec/errors_spec.rb b/src/ruby/spec/errors_spec.rb
index 6fb22b1..798b39e 100644 (file)
--- a/src/ruby/spec/errors_spec.rb
+++ b/src/ruby/spec/errors_spec.rb
@@ -131,7 +131,7 @@ describe GRPC::BadStatus do
 
       error_msg = 'parse error: to_rpc_status failed'
       error_desc = '<Google::Protobuf::ParseError> ' \
-        'Error occurred during parsing: Invalid wire type'
+        'Error occurred during parsing'
 
       # Check that the parse error was logged correctly
       log_contents = @log_output.read

diff --git a/src/ruby/tools/version.rb b/src/ruby/tools/version.rb
index 93dfd5f..9dc03ed 100644 (file)
--- a/src/ruby/tools/version.rb
+++ b/src/ruby/tools/version.rb
@@ -14,6 +14,6 @@
 
 module GRPC
   module Tools
-    VERSION = '1.36.0'
+    VERSION = '1.36.1'
   end
 end

diff --git a/tools/distrib/python/grpc_version.py b/tools/distrib/python/grpc_version.py
index 0582e28..03aa2c8 100644 (file)
--- a/tools/distrib/python/grpc_version.py
+++ b/tools/distrib/python/grpc_version.py
@@ -14,5 +14,5 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!!
 
-VERSION = '1.36.0'
+VERSION = '1.36.1'
 PROTOBUF_VERSION = '3.14.0'

diff --git a/tools/distrib/python/grpcio_tools/grpc_version.py b/tools/distrib/python/grpcio_tools/grpc_version.py
index 2ac1b85..7f29f49 100644 (file)
--- a/tools/distrib/python/grpcio_tools/grpc_version.py
+++ b/tools/distrib/python/grpcio_tools/grpc_version.py
@@ -14,5 +14,5 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!!
 
-VERSION = '1.36.0'
+VERSION = '1.36.1'
 PROTOBUF_VERSION = '3.14.0'

diff --git a/tools/doxygen/Doxyfile.c++ b/tools/doxygen/Doxyfile.c++
index 85516e6..8617794 100644 (file)
--- a/tools/doxygen/Doxyfile.c++
+++ b/tools/doxygen/Doxyfile.c++
@@ -40,7 +40,7 @@ PROJECT_NAME           = "GRPC C++"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.36.0
+PROJECT_NUMBER         = 1.36.1
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal
index 6e254d1..7c5d7d7 100644 (file)
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@@ -40,7 +40,7 @@ PROJECT_NAME           = "GRPC C++"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.36.0
+PROJECT_NUMBER         = 1.36.1
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/tools/doxygen/Doxyfile.objc b/tools/doxygen/Doxyfile.objc
index affdcfa..f7f238d 100644 (file)
--- a/tools/doxygen/Doxyfile.objc
+++ b/tools/doxygen/Doxyfile.objc
@@ -40,7 +40,7 @@ PROJECT_NAME           = "GRPC Objective-C"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.36.0
+PROJECT_NUMBER         = 1.36.1
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/tools/doxygen/Doxyfile.objc.internal b/tools/doxygen/Doxyfile.objc.internal
index ff9f3ee..f1477ae 100644 (file)
--- a/tools/doxygen/Doxyfile.objc.internal
+++ b/tools/doxygen/Doxyfile.objc.internal
@@ -40,7 +40,7 @@ PROJECT_NAME           = "GRPC Objective-C"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.36.0
+PROJECT_NUMBER         = 1.36.1
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/tools/doxygen/Doxyfile.php b/tools/doxygen/Doxyfile.php
index 67eada8..12f58b0 100644 (file)
--- a/tools/doxygen/Doxyfile.php
+++ b/tools/doxygen/Doxyfile.php
@@ -40,7 +40,7 @@ PROJECT_NAME           = "GRPC PHP"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.36.0
+PROJECT_NUMBER         = 1.36.1
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a