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

Release 1.6 - fixes and minor changes #563

Merged
merged 302 commits into from
Oct 8, 2024

Merge pull request #569 from jacksorjacksor/patch-1

f05dcf4
Select commit
Loading
Failed to load commit list.
Merged

Release 1.6 - fixes and minor changes #563

Merge pull request #569 from jacksorjacksor/patch-1
f05dcf4
Select commit
Loading
Failed to load commit list.
DCO / DCO required action Sep 24, 2024 in 4s

DCO

There are 14 commits incorrectly signed off. This means that the author(s) of these commits failed to include a Signed-off-by line in their commit message.

To avoid having PRs blocked in the future, always include Signed-off-by: Author Name <[email protected]> in every commit message. You can also do this automatically by using the -s flag (i.e., git commit -s).

Here is how to fix the problem so that this code can be merged.


Preferred method: Commit author adds a DCO remediation commit

A DCO Remediation Commit contains special text in the commit message that applies a missing Signed-off-by line in a subsequent commit. The primary benefit of this method is that the project’s history does not change, and there is no risk of breaking someone else’s work.

These authors can unblock this PR by adding a new commit to this branch with the following text in their commit message:

Dan Benitah <[email protected]>

DCO Remediation Commit for Dan Benitah <[email protected]>

I, Dan Benitah <[email protected]>, hereby add my Signed-off-by to this commit: ed464fc1fc8d5156cfac1f7af97b1873022aa1a6
I, Dan Benitah <[email protected]>, hereby add my Signed-off-by to this commit: 5f0bbff99b54a05d07c0a6844276412910a262ab
I, Dan Benitah <[email protected]>, hereby add my Signed-off-by to this commit: f5b3eb645264ed99a98b8e56edc1a0a9c32aec41
I, Dan Benitah <[email protected]>, hereby add my Signed-off-by to this commit: 89c1d64a3240edba88354bf3ce9572d3802f07df
I, Dan Benitah <[email protected]>, hereby add my Signed-off-by to this commit: 093ecb48ddada5f254ece45ed17a96dd7bd22b15
I, Dan Benitah <[email protected]>, hereby add my Signed-off-by to this commit: f15a5939737e234a63a20b9e31712718175e1059
I, Dan Benitah <[email protected]>, hereby add my Signed-off-by to this commit: 8cabb040e37bc9abb366918a2de83c98e636732b
I, Dan Benitah <[email protected]>, hereby add my Signed-off-by to this commit: fe6797d11fcaa3d12b83d0c5b486f9eb54235c42

Signed-off-by: Dan Benitah <[email protected]>

rinikeda <[email protected]>

DCO Remediation Commit for rinikeda <[email protected]>

I, rinikeda <[email protected]>, hereby add my Signed-off-by to this commit: a74be265e1ced2ae087531d06d1d316e00137c13

Signed-off-by: rinikeda <[email protected]>

Takuya Iwatsuka <[email protected]>

DCO Remediation Commit for Takuya Iwatsuka <[email protected]>

I, Takuya Iwatsuka <[email protected]>, hereby add my Signed-off-by to this commit: 9d51f799b7da57791e28f7e6ef63bd4e9d68d72d

Signed-off-by: Takuya Iwatsuka <[email protected]>

Vaughan Knight <[email protected]>

DCO Remediation Commit for Vaughan Knight <[email protected]>

I, Vaughan Knight <[email protected]>, hereby add my Signed-off-by to this commit: 81376591ce3cdaf8ed29f8d8608e24d2ae8a453b
I, Vaughan Knight <[email protected]>, hereby add my Signed-off-by to this commit: f64ec8eb3ff8ae0fd01f0e52f2d47294b71adb77
I, Vaughan Knight <[email protected]>, hereby add my Signed-off-by to this commit: daa4503679c42aa0873d70a8b5283ca332f064c0
I, Vaughan Knight <[email protected]>, hereby add my Signed-off-by to this commit: 903a58f7d698d833178b71f484abf61a721b4117

Signed-off-by: Vaughan Knight <[email protected]>

Please note: You should avoid adding empty commits (i.e., git commit -s --allow-empty), because these will be discarded if someone rebases the branch / repo.


Least preferred method: Rebase the branch

If you have a local git environment and meet the criteria below, one option is to rebase the branch and add your Signed-off-by lines in the new commits. Please note that if others have already begun work based upon the commits in this branch, this solution will rewrite history and may cause serious issues for collaborators (described in the git documentation under "The Perils of Rebasing").

You should only do this if:

  • You are the only author of the commits in this branch
  • You are absolutely certain nobody else is doing any work based upon this branch
  • There are no empty commits in the branch (for example, a DCO Remediation Commit which was added using --allow-empty)

To add your Signed-off-by line to every commit in this branch:

  1. Ensure you have a local copy of your branch by checking out the pull request locally via command line.
  2. In your local branch, run: git rebase HEAD~250 --signoff
  3. Force push your changes to overwrite the branch: git push --force-with-lease origin dev

Summary

Commit sha: ed464fc, Author: Dan Benitah, Committer: Dan Benitah; Commit by organization member is not verified.
Commit sha: 5f0bbff, Author: Dan Benitah, Committer: Dan Benitah; Commit by organization member is not verified.
Commit sha: f5b3eb6, Author: Dan Benitah, Committer: Dan Benitah; Commit by organization member is not verified.
Commit sha: 89c1d64, Author: Dan Benitah, Committer: Dan Benitah; Commit by organization member is not verified.
Commit sha: 093ecb4, Author: Dan Benitah, Committer: Dan Benitah; Commit by organization member is not verified.
Commit sha: f15a593, Author: Dan Benitah, Committer: Dan Benitah; Commit by organization member is not verified.
Commit sha: 8cabb04, Author: Dan Benitah, Committer: Dan Benitah; Commit by organization member is not verified.
Commit sha: fe6797d, Author: Dan Benitah, Committer: Dan Benitah; Commit by organization member is not verified.
Commit sha: a74be26, Author: rinikeda, Committer: Dan Benitah; Expected "rinikeda [email protected]", but got "Rintaro Ikeda [email protected]".
Commit sha: 9d51f79, Author: Takuya Iwatsuka, Committer: Yasumasa Suenaga; Expected "Takuya Iwatsuka [email protected]", but got "Yasumasa Suenaga [email protected]".
Commit sha: 8137659, Author: Vaughan Knight, Committer: Vaughan Knight; Commit by organization member is not verified.
Commit sha: f64ec8e, Author: Vaughan Knight, Committer: Vaughan Knight; Commit by organization member is not verified.
Commit sha: daa4503, Author: Vaughan Knight, Committer: Vaughan Knight; Commit by organization member is not verified.
Commit sha: 903a58f, Author: Vaughan Knight, Committer: Vaughan Knight; Commit by organization member is not verified.