Skip to content

Commit

Permalink
Merge branch 'cg-server' into cg-transport-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
ctiller committed Jan 3, 2024
2 parents e285757 + 2787b9f commit 1989bcc
Show file tree
Hide file tree
Showing 97 changed files with 3,610 additions and 3,892 deletions.
2 changes: 1 addition & 1 deletion BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,6 @@ GRPC_XDS_TARGETS = [
"//src/core:grpc_lb_policy_cds",
"//src/core:grpc_lb_policy_xds_cluster_impl",
"//src/core:grpc_lb_policy_xds_cluster_manager",
"//src/core:grpc_lb_policy_xds_cluster_resolver",
"//src/core:grpc_lb_policy_xds_override_host",
"//src/core:grpc_lb_policy_xds_wrr_locality",
"//src/core:grpc_lb_policy_ring_hash",
Expand Down Expand Up @@ -3675,6 +3674,7 @@ grpc_cc_library(
],
external_deps = [
"absl/base:core_headers",
"absl/cleanup",
"absl/memory",
"absl/status",
"absl/status:statusor",
Expand Down
50 changes: 2 additions & 48 deletions CMakeLists.txt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Makefile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions Package.swift

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 1 addition & 12 deletions bazel/experiments.bzl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 1989bcc

Please sign in to comment.