From .
 * [new ref]                   HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                   refs/pull/48073/head -> cms-sw/refs/pull/48073/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 FWCore/Services/src/SiteLocalConfigService.cc      |   6 +-
 IOPool/TFileAdaptor/src/TFileAdaptor.cc            |  94 +++--
 IOPool/TFileAdaptor/src/TFileAdaptor.h             |   2 +-
 .../DCacheAdaptor/plugins/DCacheStorageMaker.cc    |   5 +-
 .../DavixAdaptor/plugins/DavixStorageMaker.cc      |   6 +-
 Utilities/StorageFactory/BuildFile.xml             |   1 +
 Utilities/StorageFactory/README.md                 |  60 ++-
 .../StorageFactory/interface/StorageFactory.h      |  28 +-
 Utilities/StorageFactory/interface/StorageMaker.h  |   5 +
 .../StorageFactory/interface/StorageProxyMaker.h   |  20 +
 .../interface/StorageProxyMakerFactory.h           |  14 +
 Utilities/StorageFactory/plugins/BuildFile.xml     |  11 +
 .../StorageFactory/plugins/HttpStorageMaker.cc     |   2 +
 .../StorageFactory/plugins/LocalStorageMaker.cc    |   5 +-
 .../plugins/StorageAddLatencyProxy.cc              | 130 ++++++
 .../StorageFactory/plugins/StorageTracerProxy.cc   | 261 ++++++++++++
 .../StorageFactory/scripts/edmStorageTrace.py      | 466 +++++++++++++++++++++
 Utilities/StorageFactory/src/StorageFactory.cc     |  55 ++-
 Utilities/StorageFactory/src/StorageProxyMaker.cc  |   5 +
 .../StorageFactory/src/StorageProxyMakerFactory.cc |   6 +
 Utilities/StorageFactory/test/BuildFile.xml        |   4 +
 .../StorageFactory/test/test_storageproxies.sh     |  27 ++
 .../test/test_storageproxy_make_file_cfg.py        |  16 +
 .../test/test_storageproxy_test_cfg.py             |  40 ++
 Utilities/XrdAdaptor/README.md                     |  25 ++
 Utilities/XrdAdaptor/plugins/XrdStorageMaker.cc    |   5 +-
 26 files changed, 1233 insertions(+), 66 deletions(-)
 create mode 100644 Utilities/StorageFactory/interface/StorageProxyMaker.h
 create mode 100644 Utilities/StorageFactory/interface/StorageProxyMakerFactory.h
 create mode 100644 Utilities/StorageFactory/plugins/StorageAddLatencyProxy.cc
 create mode 100644 Utilities/StorageFactory/plugins/StorageTracerProxy.cc
 create mode 100755 Utilities/StorageFactory/scripts/edmStorageTrace.py
 create mode 100644 Utilities/StorageFactory/src/StorageProxyMaker.cc
 create mode 100644 Utilities/StorageFactory/src/StorageProxyMakerFactory.cc
 create mode 100755 Utilities/StorageFactory/test/test_storageproxies.sh
 create mode 100644 Utilities/StorageFactory/test/test_storageproxy_make_file_cfg.py
 create mode 100644 Utilities/StorageFactory/test/test_storageproxy_test_cfg.py
Switched to branch 'from-CMSSW_15_1_X_2025-05-15-1100'