Skip to content

Commit

Permalink
Merge branch 'master' into LogicalConnection
Browse files Browse the repository at this point in the history
  • Loading branch information
yashykt committed Jan 6, 2025
2 parents 851020f + 3c00b97 commit 0ac2157
Show file tree
Hide file tree
Showing 1,791 changed files with 27,357 additions and 18,718 deletions.
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.3.1
7.4.1
1 change: 0 additions & 1 deletion .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ Checks: '-*,
modernize-replace-auto-ptr,
modernize-replace-random-shuffle,
modernize-shrink-to-fit,
modernize-unary-static-assert,
modernize-use-bool-literals,
modernize-use-noexcept,
modernize-use-nullptr,
Expand Down
16 changes: 11 additions & 5 deletions BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -212,11 +212,11 @@ config_setting(
python_config_settings()

# This should be updated along with build_handwritten.yaml
g_stands_for = "gridiron" # @unused
g_stands_for = "genius" # @unused

core_version = "44.1.0" # @unused
core_version = "44.2.0" # @unused

version = "1.69.0-dev" # @unused
version = "1.70.0-dev" # @unused

GPR_PUBLIC_HDRS = [
"include/grpc/support/alloc.h",
Expand Down Expand Up @@ -1971,6 +1971,7 @@ grpc_cc_library(
"//src/core:event_engine_common",
"//src/core:event_engine_context",
"//src/core:experiments",
"//src/core:filter_args",
"//src/core:for_each",
"//src/core:gpr_atm",
"//src/core:gpr_manual_constructor",
Expand Down Expand Up @@ -3407,6 +3408,7 @@ grpc_cc_library(
visibility = ["@grpc:alt_grpc_base_legacy"],
deps = [
"gpr_platform",
"//src/core:experiments",
"//src/core:time",
],
)
Expand Down Expand Up @@ -3733,6 +3735,7 @@ grpc_cc_library(
"//src/core:channel_fwd",
"//src/core:channel_init",
"//src/core:channel_stack_type",
"//src/core:client_channel_args",
"//src/core:client_channel_backup_poller",
"//src/core:client_channel_internal_header",
"//src/core:client_channel_service_config",
Expand Down Expand Up @@ -3773,6 +3776,7 @@ grpc_cc_library(
"//src/core:ref_counted",
"//src/core:resolved_address",
"//src/core:resource_quota",
"//src/core:retry_interceptor",
"//src/core:retry_service_config",
"//src/core:retry_throttle",
"//src/core:seq",
Expand Down Expand Up @@ -3889,6 +3893,7 @@ grpc_cc_library(
deps = [
"config",
"debug_location",
"event_engine_base_hdrs",
"exec_ctx",
"gpr",
"grpc_base",
Expand All @@ -3900,17 +3905,17 @@ grpc_cc_library(
"orphanable",
"ref_counted_ptr",
"resource_quota_api",
"sockaddr_utils",
"uri",
"//src/core:channel_args",
"//src/core:channel_args_preconditioning",
"//src/core:closure",
"//src/core:error",
"//src/core:error_utils",
"//src/core:event_engine_common",
"//src/core:event_engine_tcp_socket_utils",
"//src/core:handshaker_registry",
"//src/core:iomgr_fwd",
"//src/core:pollset_set",
"//src/core:resolved_address",
"//src/core:resource_quota",
"//src/core:slice",
"//src/core:slice_refcount",
Expand Down Expand Up @@ -4359,6 +4364,7 @@ grpc_cc_library(
],
external_deps = [
"absl/base:core_headers",
"absl/container:flat_hash_set",
"absl/cleanup",
"absl/log:check",
"absl/log:log",
Expand Down
Loading

0 comments on commit 0ac2157

Please sign in to comment.