Skip to content

Reapply MR lost during sweep

Julien Esseiva requested to merge juesseiv/athena:fix-sweep-lost-mr into main

The three MRs mentioned in !72906 (merged) were originally merged into main, but had to be backported to 24.0. During the sweep !72990 (merged), !72906 (merged) was reverted instead of being ignored. So, this MR reapplies changes undone by the sweep MR.

In addition, !72966 (merged) wasn't included in the sweep because of conflicts, so I'm cherry-picking that MR to main as well.

All the changes here have already been reviewed.

cc @tsulaia

Edited by Julien Esseiva

Merge request reports