From .
 * [new ref]                   HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                   refs/pull/47171/head -> cms-sw/refs/pull/47171/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 CondCore/CondDB/interface/IOVProxy.h             |  8 ++++++-
 CondCore/CondDB/src/IOVProxy.cc                  | 28 ++++++++++++++++++------
 CondCore/ESSources/interface/ProductResolver.h   |  5 +++++
 CondCore/ESSources/plugins/CondDBESSource.cc     | 14 +++++++++++-
 CondCore/ESSources/plugins/CondDBESSource.h      |  2 ++
 CondCore/ESSources/python/CondDBESSource_cfi.py  |  3 ++-
 CondCore/ESSources/src/ProductResolverFactory.cc | 15 +++++++++++++
 7 files changed, 65 insertions(+), 10 deletions(-)
Switched to branch 'from-CMSSW_15_1_X_2025-03-23-2300'