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

update sample outputs of key list cmd to match singularity PR 1957, from sylabs 174 #242

Merged
merged 2 commits into from
Mar 8, 2024

Conversation

JasonYangShadow
Copy link
Member

@JasonYangShadow JasonYangShadow commented Mar 6, 2024

This fixes a subpart of #239 by merging

The original PR description was:

sylabs/singularity#1957 changes the format of the output of singularity key list. This PR updates the sample outputs of this command contained in the User Guide to match this change.

@JasonYangShadow JasonYangShadow force-pushed the singularity-docs/174 branch 2 times, most recently from 604d320 to 23ed3e2 Compare March 6, 2024 07:25
Copy link
Contributor

@DrDaveD DrDaveD left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks OK other than the DCO check.

@JasonYangShadow
Copy link
Member Author

https://github.com/sylabs/singularity-userdocs/pull/174/commits
the original author does not sign off commits.

@DrDaveD DrDaveD changed the title update sample outputs of key list cmd to match singularity PR 1957 (cherry pick #174) update sample outputs of key list cmd to match singularity PR 1957, from sylabs 174 Mar 7, 2024
@DrDaveD
Copy link
Contributor

DrDaveD commented Mar 7, 2024

the original author does not sign off commits.

That's normal. You need to sign off on it instead.

For the description, please follow the pattern in one of mine like #244

@DrDaveD
Copy link
Contributor

DrDaveD commented Mar 7, 2024

If a cherry-pick succeeds without any conflicts, it doesn't give you the opportunity to add sign-off, but you can use the -s option on cherry-pick to add it or you can use -n to not automatically commit. Watch out though with the latter that it doesn't lose the original author, I think sometimes at least it does. In that case you should add back the original author with the commit --author option.

@DrDaveD DrDaveD merged commit e3f9b0d into apptainer:main Mar 8, 2024
2 checks passed
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