Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into xds_e2e_test_refa…
Browse files Browse the repository at this point in the history
…ctoring
  • Loading branch information
markdroth committed Dec 27, 2024
2 parents 4e40d6e + 6768331 commit 36ef13b
Show file tree
Hide file tree
Showing 147 changed files with 4,483 additions and 3,180 deletions.
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
5 changes: 3 additions & 2 deletions BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -3872,6 +3872,7 @@ grpc_cc_library(
deps = [
"config",
"debug_location",
"event_engine_base_hdrs",
"exec_ctx",
"gpr",
"grpc_base",
Expand All @@ -3883,17 +3884,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
Loading

0 comments on commit 36ef13b

Please sign in to comment.