Restore mercury to v2.4.0rc5

Required-githooks: true Change-Id: I10ac4c7b9cc674167a40c6b92014f58acf33de72 Signed-off-by: Jeff Olivier <[email protected]>
daos-stack · Oct 29, 2024 · 948c9ea · 948c9ea
1 parent 7cdf301
commit 948c9ea
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/utils/build.config b/utils/build.config
@@ -9,7 +9,7 @@ isal=v2.30.0
 isal_crypto=v2.23.0
 spdk=v22.01.2
 ofi=v1.19.1
-mercury=v2.3.1
+mercury=v2.4.0rc5
 protobufc=v1.3.3
 ucx=v1.14.1
 
@@ -28,5 +28,5 @@ ucx=https://github.com/openucx/ucx.git
 [patch_versions]
 spdk=https://github.com/spdk/spdk/commit/b0aba3fcd5aceceea530a702922153bc75664978.diff,https://github.com/spdk/spdk/commit/445a4c808badbad3942696ecf16fa60e8129a747.diff
 ofi=https://github.com/ofiwg/libfabric/commit/d827c6484cc5bf67dfbe395890e258860c3f0979.diff
-mercury=https://raw.githubusercontent.com/daos-stack/mercury/857f1d5d2ca72d4c1b8d7be5e7fd26d6292b495f/na_ucx_am_send_retry.patch,https://github.com/mercury-hpc/mercury/commit/b8c26fd86281f3b0883c31bd2d0cb467a12b860d.diff,https://github.com/mercury-hpc/mercury/commit/a35589c3d1134d9c80640e78247e210162ac4a3c.diff,https://github.com/mercury-hpc/mercury/commit/fa4abbb6273d975b2ef17ac4e561fd4255d384db.diff
+mercury=https://raw.githubusercontent.com/daos-stack/mercury/f3dc286fb40ec1a3a38a2e17c45497bc2aa6290d/na_ucx.patch
 fuse=https://github.com/libfuse/libfuse/commit/c9905341ea34ff9acbc11b3c53ba8bcea35eeed8.diff