Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v1.17: [anza migration]: fix download link for net scripts (backport of #219) #351

Merged
merged 2 commits into from
Mar 21, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Mar 21, 2024

Problem

#204 introduced a wrong download link 😞

Summary of Changes

correct it


This is an automatic backport of pull request #219 done by Mergify.

(cherry picked from commit e682fec)

# Conflicts:
#	net/net.sh
#	scripts/agave-install-deploy.sh
@mergify mergify bot added the conflicts label Mar 21, 2024
Copy link
Author

mergify bot commented Mar 21, 2024

Cherry-pick of e682fec has failed:

On branch mergify/bp/v1.17/pr-219
Your branch is up to date with 'origin/v1.17'.

You are currently cherry-picking commit e682fec28e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   net/net.sh
	both modified:   scripts/agave-install-deploy.sh

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot assigned yihau Mar 21, 2024
@yihau yihau removed the conflicts label Mar 21, 2024
@yihau yihau requested a review from joeaba March 21, 2024 02:47
@yihau
Copy link
Member

yihau commented Mar 21, 2024

net scripts chages, merge it on red!

@yihau yihau merged commit 11d4156 into v1.17 Mar 21, 2024
8 of 12 checks passed
@yihau yihau deleted the mergify/bp/v1.17/pr-219 branch March 21, 2024 02:50
@HaoranYi HaoranYi mentioned this pull request Apr 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants