Closed illusional closed 1 year ago
Reverting an upstream merge, then applying updates on top has borked our hail history. So:
git checkout fc212f5 git switch -c hail-117-surgery git cherry-pick fb9d2f7 # Apply 'Revert "[services] indicate how many errors we have seen" #291' git merge cd64e08 # Effectively apply 'Intermediate upstream merge to fix cloudfuse issues #292' git cherry-pick d4d2d4f # Apply 'Allow optional byte suffix for memory and storage requests #293' git cherry-pick d8b169a # Apply 'FIX: storage accounts weren't unique. Added prefix. #294' git merge 113b989 # Apply partial upstream-117 to CI changes (equiv to: #296)
@jmarshall, if you're happy, I'll force push this branch to main, and then go from there.
Reverting an upstream merge, then applying updates on top has borked our hail history. So:
@jmarshall, if you're happy, I'll force push this branch to main, and then go from there.