Sync c-core 1.60.1 (#228)

grpc · Feb 3, 2024 · c5ae012 · c5ae012
1 parent f5c4996
commit c5ae012
Show file tree

Hide file tree

Showing 53 changed files with 57 additions and 57 deletions.
diff --git a/native/BUILD b/native/BUILD
@@ -215,7 +215,7 @@ g_stands_for = "gjallarhorn"  # @unused
 
 core_version = "37.0.0"  # @unused
 
-version = "1.60.0"  # @unused
+version = "1.60.1"  # @unused
 
 GPR_PUBLIC_HDRS = [
     "include/grpc/support/alloc.h",

diff --git a/native/CMakeLists.txt b/native/CMakeLists.txt
diff --git a/native/Makefile b/native/Makefile
diff --git a/native/REVISION.txt b/native/REVISION.txt
@@ -1 +1 @@
-0ef13a7555dbaadd4633399242524129eef5e231
+e5ae3b6b44bf3b64d24bfb4b4f82556239b986db
diff --git a/native/_metadata.py b/native/_metadata.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/_metadata.py.template`!!!
 
-__version__ = """1.60.0"""
+__version__ = """1.60.1"""
diff --git a/native/build_handwritten.yaml b/native/build_handwritten.yaml
@@ -16,7 +16,7 @@ settings:
   csharp_major_version: 2
   g_stands_for: gjallarhorn
   protobuf_version: 3.25.0
-  version: 1.60.0
+  version: 1.60.1
 configs:
   asan:
     CC: clang

diff --git a/native/config.m4 b/native/config.m4
diff --git a/native/gRPC-C++.podspec b/native/gRPC-C++.podspec
diff --git a/native/gRPC-Core.podspec b/native/gRPC-Core.podspec
diff --git a/native/gRPC-ProtoRPC.podspec b/native/gRPC-ProtoRPC.podspec
diff --git a/native/gRPC-RxLibrary.podspec b/native/gRPC-RxLibrary.podspec
diff --git a/native/gRPC.podspec b/native/gRPC.podspec
diff --git a/native/include/grpcpp/version_info.h b/native/include/grpcpp/version_info.h
@@ -20,8 +20,8 @@
 
 #define GRPC_CPP_VERSION_MAJOR 1
 #define GRPC_CPP_VERSION_MINOR 60
-#define GRPC_CPP_VERSION_PATCH 0
+#define GRPC_CPP_VERSION_PATCH 1
 #define GRPC_CPP_VERSION_TAG ""
-#define GRPC_CPP_VERSION_STRING "1.60.0"
+#define GRPC_CPP_VERSION_STRING "1.60.1"
 
 #endif  // GRPCPP_VERSION_INFO_H
diff --git a/native/package.xml b/native/package.xml
diff --git a/native/src/csharp/build/dependencies.props b/native/src/csharp/build/dependencies.props
@@ -1,7 +1,7 @@
 <!-- This file is generated -->
 <Project>
   <PropertyGroup>
-    <GrpcCsharpVersion>2.60.0</GrpcCsharpVersion>
+    <GrpcCsharpVersion>2.60.1</GrpcCsharpVersion>
     <GoogleProtobufVersion>3.25.0</GoogleProtobufVersion>
   </PropertyGroup>
 </Project>
diff --git a/native/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec b/native/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.60.0'
+  v = '1.60.1'
   s.version  = v
   s.summary  = 'The gRPC ProtoC plugin generates C++ files from .proto services.'
   s.description = <<-DESC

diff --git a/native/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec b/native/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.60.0'
+  v = '1.60.1'
   s.version  = v
   s.summary  = 'The gRPC ProtoC plugin generates Objective-C files from .proto services.'
   s.description = <<-DESC

diff --git a/native/src/objective-c/GRPCClient/version.h b/native/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.60.0"
+#define GRPC_OBJC_VERSION_STRING @"1.60.1"
diff --git a/native/src/objective-c/tests/version.h b/native/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.60.0"
+#define GRPC_OBJC_VERSION_STRING @"1.60.1"
 #define GRPC_C_VERSION_STRING @"37.0.0"
diff --git a/native/src/php/composer.json b/native/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.60.0",
+  "version": "1.60.1",
   "require": {
     "php": ">=7.0.0",
     "google/protobuf": "^v3.3.0"

diff --git a/native/src/php/ext/grpc/version.h b/native/src/php/ext/grpc/version.h
@@ -20,6 +20,6 @@
 #ifndef VERSION_H
 #define VERSION_H
 
-#define PHP_GRPC_VERSION "1.60.0"
+#define PHP_GRPC_VERSION "1.60.1"
 
 #endif /* VERSION_H */
diff --git a/native/src/python/grpcio/grpc/_grpcio_metadata.py b/native/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.60.0"""
+__version__ = """1.60.1"""
diff --git a/native/src/python/grpcio/grpc/_server.py b/native/src/python/grpcio/grpc/_server.py
@@ -579,7 +579,7 @@ def _call_behavior(
                                 exception.__traceback__,
                             )
                         )
-                    traceback.print_exc()
+                        traceback.print_exc()
                     _LOGGER.exception(details)
                     _abort(
                         state,

diff --git a/native/src/python/grpcio/grpc_version.py b/native/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.60.0'
+VERSION = '1.60.1'
diff --git a/native/src/python/grpcio_admin/grpc_version.py b/native/src/python/grpcio_admin/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_admin/grpc_version.py.template`!!!
 
-VERSION = '1.60.0'
+VERSION = '1.60.1'
diff --git a/native/src/python/grpcio_channelz/grpc_version.py b/native/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.60.0'
+VERSION = '1.60.1'
diff --git a/native/src/python/grpcio_csds/grpc_version.py b/native/src/python/grpcio_csds/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_csds/grpc_version.py.template`!!!
 
-VERSION = '1.60.0'
+VERSION = '1.60.1'
diff --git a/native/src/python/grpcio_health_checking/grpc_version.py b/native/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.60.0'
+VERSION = '1.60.1'
diff --git a/native/src/python/grpcio_reflection/grpc_version.py b/native/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.60.0'
+VERSION = '1.60.1'
diff --git a/native/src/python/grpcio_status/grpc_version.py b/native/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.60.0'
+VERSION = '1.60.1'
diff --git a/native/src/python/grpcio_testing/grpc_version.py b/native/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.60.0'
+VERSION = '1.60.1'
diff --git a/native/src/python/grpcio_tests/grpc_version.py b/native/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.60.0'
+VERSION = '1.60.1'
diff --git a/native/src/ruby/lib/grpc/version.rb b/native/src/ruby/lib/grpc/version.rb
@@ -14,5 +14,5 @@
 
 # GRPC contains the General RPC module.
 module GRPC
-  VERSION = '1.60.0'
+  VERSION = '1.60.1'
 end
diff --git a/native/src/ruby/nativedebug/version.rb b/native/src/ruby/nativedebug/version.rb
@@ -14,6 +14,6 @@
 
 module GRPC
   module NativeDebug
-    VERSION = '1.60.0'
+    VERSION = '1.60.1'
   end
 end
diff --git a/native/src/ruby/tools/version.rb b/native/src/ruby/tools/version.rb
@@ -14,6 +14,6 @@
 
 module GRPC
   module Tools
-    VERSION = '1.60.0'
+    VERSION = '1.60.1'
   end
 end
diff --git a/native/tools/distrib/python/grpc_version.py b/native/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.60.0'
+VERSION = '1.60.1'
 PROTOBUF_VERSION = '3.25.0'
diff --git a/native/tools/distrib/python/grpcio_tools/grpc_version.py b/native/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.60.0'
+VERSION = '1.60.1'
 PROTOBUF_VERSION = '3.25.0'
diff --git a/native/tools/distrib/python/xds_protos/grpc_version.py b/native/tools/distrib/python/xds_protos/grpc_version.py
@@ -14,5 +14,5 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!!
 
-VERSION = '1.60.0'
+VERSION = '1.60.1'
 PROTOBUF_VERSION = '3.25.0'
diff --git a/native/tools/doxygen/Doxyfile.c++ b/native/tools/doxygen/Doxyfile.c++
diff --git a/native/tools/doxygen/Doxyfile.c++.internal b/native/tools/doxygen/Doxyfile.c++.internal
diff --git a/native/tools/doxygen/Doxyfile.objc b/native/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.60.0
+PROJECT_NUMBER         = 1.60.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/native/tools/doxygen/Doxyfile.objc.internal b/native/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.60.0
+PROJECT_NUMBER         = 1.60.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/native/tools/doxygen/Doxyfile.php b/native/tools/doxygen/Doxyfile.php
@@ -40,7 +40,7 @@
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.60.0
+PROJECT_NUMBER         = 1.60.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/native/tools/internal_ci/linux/grpc_xds_k8s_lb.sh b/native/tools/internal_ci/linux/grpc_xds_k8s_lb.sh
@@ -17,7 +17,7 @@ set -eo pipefail
 
 # Constants
 readonly GITHUB_REPOSITORY_NAME="grpc"
-readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/grpc/${TEST_DRIVER_BRANCH:-master}/tools/internal_ci/linux/grpc_xds_k8s_install_test_driver.sh"
+readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/psm-interop/${TEST_DRIVER_BRANCH:-main}/.kokoro/psm_interop_kokoro_lib.sh"
 ## xDS test client Docker images
 readonly SERVER_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/cpp-server"
 readonly CLIENT_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/cpp-client"

diff --git a/native/tools/internal_ci/linux/grpc_xds_k8s_lb_python.sh b/native/tools/internal_ci/linux/grpc_xds_k8s_lb_python.sh
@@ -17,7 +17,7 @@ set -eo pipefail
 
 # Constants
 readonly GITHUB_REPOSITORY_NAME="grpc"
-readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/grpc/${TEST_DRIVER_BRANCH:-master}/tools/internal_ci/linux/grpc_xds_k8s_install_test_driver.sh"
+readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/psm-interop/${TEST_DRIVER_BRANCH:-main}/.kokoro/psm_interop_kokoro_lib.sh"
 ## xDS test client Docker images
 readonly SERVER_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/python-server"
 readonly CLIENT_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/python-client"

diff --git a/native/tools/internal_ci/linux/grpc_xds_k8s_xbranch.sh b/native/tools/internal_ci/linux/grpc_xds_k8s_xbranch.sh
@@ -17,7 +17,7 @@ set -eo pipefail
 
 # Constants
 readonly GITHUB_REPOSITORY_NAME="grpc"
-readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/grpc/${TEST_DRIVER_BRANCH:-master}/tools/internal_ci/linux/grpc_xds_k8s_install_test_driver.sh"
+readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/psm-interop/${TEST_DRIVER_BRANCH:-main}/.kokoro/psm_interop_kokoro_lib.sh"
 readonly LANGS="cpp go java"
 readonly MAIN_BRANCH="${MAIN_BRANCH:-master}"
 

diff --git a/native/tools/internal_ci/linux/grpc_xds_k8s_xlang.sh b/native/tools/internal_ci/linux/grpc_xds_k8s_xlang.sh
@@ -17,7 +17,7 @@ set -eo pipefail
 
 # Constants
 readonly GITHUB_REPOSITORY_NAME="grpc"
-readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/grpc/${TEST_DRIVER_BRANCH:-master}/tools/internal_ci/linux/grpc_xds_k8s_install_test_driver.sh"
+readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/psm-interop/${TEST_DRIVER_BRANCH:-main}/.kokoro/psm_interop_kokoro_lib.sh"
 ## xDS test server/client Docker images
 readonly SERVER_LANGS="cpp go java"
 readonly CLIENT_LANGS="cpp go java"

diff --git a/native/tools/internal_ci/linux/grpc_xds_resource_cleanup.sh b/native/tools/internal_ci/linux/grpc_xds_resource_cleanup.sh
@@ -17,7 +17,7 @@ set -eo pipefail
 
 # Constants
 readonly GITHUB_REPOSITORY_NAME="grpc"
-readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/grpc/${TEST_DRIVER_BRANCH:-master}/tools/internal_ci/linux/grpc_xds_k8s_install_test_driver.sh"
+readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/psm-interop/${TEST_DRIVER_BRANCH:-main}/.kokoro/psm_interop_kokoro_lib.sh"
 # Keep orphaned resources last 2 days.
 readonly KEEP_HOURS="${KEEP_HOURS:-48}"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		0ef13a7555dbaadd4633399242524129eef5e231
		e5ae3b6b44bf3b64d24bfb4b4f82556239b986db
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,4 +14,4 @@

		# AUTO-GENERATED FROM `$REPO_ROOT/templates/_metadata.py.template`!!!

		__version__ = """1.60.0"""
		__version__ = """1.60.1"""