Merge branch 'master' into large_file_02

gnossen · Jun 29, 2024 · 1d0023b · 1d0023b
2 parents 1e0023f + ab2b28d
commit 1d0023b
Show file tree

Hide file tree

Showing 493 changed files with 17,166 additions and 4,229 deletions.
diff --git a/BUILD b/BUILD
@@ -1822,6 +1822,7 @@ grpc_cc_library(
         "//src/core:arena",
         "//src/core:call_arena_allocator",
         "//src/core:channel_args",
+        "//src/core:channel_args_endpoint_config",
         "//src/core:channel_fwd",
         "//src/core:channel_init",
         "//src/core:channel_stack_type",
@@ -3799,6 +3800,7 @@ grpc_cc_library(
         "//src/core:call_spine",
         "//src/core:cancel_callback",
         "//src/core:channel_args",
+        "//src/core:channel_args_endpoint_config",
         "//src/core:channel_fwd",
         "//src/core:channel_init",
         "//src/core:channel_stack_type",

diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/Makefile b/Makefile
diff --git a/Package.swift b/Package.swift
diff --git a/bazel/experiments.bzl b/bazel/experiments.bzl
diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl
@@ -58,12 +58,12 @@ def grpc_deps():
     if "com_google_protobuf" not in native.existing_rules():
         http_archive(
             name = "com_google_protobuf",
-            sha256 = "387478260190c540388839a3449c635a69708d92fc38ea6e2364b1196db90ea5",
-            strip_prefix = "protobuf-2434ef2adf0c74149b9d547ac5fb545a1ff8b6b5",
+            sha256 = "3ed7131962a357b35b1d55238fcc6c6a177eae766ef3e25aa916157bc6e45819",
+            strip_prefix = "protobuf-63def39e881afa496502d9c410f4ea948e59490d",
             urls = [
-                # https://github.com/protocolbuffers/protobuf/commits/v26.1
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/protobuf/archive/2434ef2adf0c74149b9d547ac5fb545a1ff8b6b5.tar.gz",
-                "https://github.com/protocolbuffers/protobuf/archive/2434ef2adf0c74149b9d547ac5fb545a1ff8b6b5.tar.gz",
+                # https://github.com/protocolbuffers/protobuf/commits/v27.2
+                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/protobuf/archive/63def39e881afa496502d9c410f4ea948e59490d.tar.gz",
+                "https://github.com/protocolbuffers/protobuf/archive/63def39e881afa496502d9c410f4ea948e59490d.tar.gz",
             ],
             patches = [
                 "@com_github_grpc_grpc//third_party:protobuf.patch",