This is an automated email from the ASF dual-hosted git repository.

bneradt pushed a commit to branch 11-Dev
in repository https://gitbox.apache.org/repos/asf/trafficserver.git

commit 1936cbe0ce62816ce3482f565c5ecb7606b4bee2
Merge: d00eba8a08 800bbf9a37
Author: Brian Neradt <[email protected]>
AuthorDate: Sat Jan 11 17:12:37 2025 -0600

    Merge latest master into 11-Dev

 .../monitoring/statistics/core/ssl.en.rst          |  44 ++++++
 include/proxy/http/remap/RemapConfig.h             |   4 +-
 src/iocore/cache/CacheDir.cc                       | 120 +++++++--------
 src/iocore/cache/CacheProcessor.cc                 |  18 +--
 src/iocore/cache/CacheRead.cc                      |   4 +-
 src/iocore/cache/CacheVC.cc                        |   6 +-
 src/iocore/cache/CacheWrite.cc                     |   2 +-
 src/iocore/cache/P_CacheDir.h                      |  55 ++++++-
 src/iocore/cache/PreservationTable.cc              |  26 ++--
 src/iocore/cache/Stripe.cc                         |  86 +++++------
 src/iocore/cache/Stripe.h                          |  75 +++-------
 src/iocore/cache/StripeSM.cc                       | 162 +++++++++++----------
 src/iocore/cache/StripeSM.h                        |   2 +-
 src/iocore/cache/unit_tests/test_CacheDir.cc       |  32 ++--
 src/iocore/cache/unit_tests/test_Stripe.cc         |  14 +-
 src/iocore/cache/unit_tests/test_doubles.h         |   2 +-
 src/iocore/net/SSLDiags.cc                         |  28 ++++
 src/iocore/net/SSLStats.cc                         |  27 ++--
 src/iocore/net/SSLStats.h                          | 122 ++++++++--------
 src/proxy/http/remap/RemapConfig.cc                |  88 ++++++-----
 src/traffic_ctl/CtrlPrinters.cc                    |   4 +-
 src/traffic_ctl/PrintUtils.cc                      |   6 +-
 src/traffic_ctl/jsonrpc/CtrlRPCRequests.h          |   4 +-
 tests/Pipfile                                      |   2 +-
 tests/gold_tests/autest-site/init.cli.ext          |   2 +-
 25 files changed, 519 insertions(+), 416 deletions(-)

Reply via email to