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

CASMINST-3171 Add necessary binary, cut #12

Merged
merged 1 commit into from
Sep 28, 2021

Conversation

rustydb
Copy link
Contributor

@rustydb rustydb commented Sep 28, 2021

@heemstra , when this merges we can just fast-forward release/csm-1.0 to main (they are linear and up-to-date):

[551]rusty@C02F43JEMD6P:~/gitstuffs/cray-shasta/dracut-metal-mdsquash>     git push --set-upstream origin bugfix/CASMINST-3171-missing-cut
Enumerating objects: 9, done.
Counting objects: 100% (9/9), done.
Delta compression using up to 12 threads
Compressing objects: 100% (4/4), done.
Writing objects: 100% (5/5), 447 bytes | 447.00 KiB/s, done.
Total 5 (delta 3), reused 0 (delta 0)
remote: Resolving deltas: 100% (3/3), completed with 3 local objects.
remote:
remote: Create a pull request for 'bugfix/CASMINST-3171-missing-cut' on GitHub by visiting:
remote:      https://github.com/Cray-HPE/dracut-metal-mdsquash/pull/new/bugfix/CASMINST-3171-missing-cut
remote:
To github.com:Cray-HPE/dracut-metal-mdsquash.git
 * [new branch]      bugfix/CASMINST-3171-missing-cut -> bugfix/CASMINST-3171-missing-cut
Branch 'bugfix/CASMINST-3171-missing-cut' set up to track remote branch 'bugfix/CASMINST-3171-missing-cut' from 'origin'.
[552]rusty@C02F43JEMD6P:~/gitstuffs/cray-shasta/dracut-metal-mdsquash> git checkout main
Switched to branch 'main'
Your branch is up to date with 'origin/main'.
[553]rusty@C02F43JEMD6P:~/gitstuffs/cray-shasta/dracut-metal-mdsquash> git pull
git mergeAlready up to date.
[554]rusty@C02F43JEMD6P:~/gitstuffs/cray-shasta/dracut-metal-mdsquash> git merge --ff release/csm-1.0
Already up to date.

@rustydb rustydb merged commit b897384 into release/csm-1.0 Sep 28, 2021
@rustydb rustydb deleted the bugfix/CASMINST-3171-missing-cut branch September 28, 2021 18:38
@rustydb
Copy link
Contributor Author

rustydb commented Sep 28, 2021

Note: also merging this into main (fast-forward merge from release/csm-1.0 to main).

image
issue will still exist in main, so this fix will patch both branches.

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.

3 participants