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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] main from hyperledger:main #194

Merged
merged 77 commits into from
Jul 10, 2024

Merge pull request #3092 from swcurran/1.0.0rc4

811ff3b
Select commit
Loading
Failed to load commit list.
Merged

[pull] main from hyperledger:main #194

Merge pull request #3092 from swcurran/1.0.0rc4
811ff3b
Select commit
Loading
Failed to load commit list.
DCO / DCO required action Jul 9, 2024 in 1s

DCO

There are 12 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 <authoremail@example.com> 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.


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~77 --signoff
  3. Force push your changes to overwrite the branch: git push --force-with-lease origin main

Summary

Commit sha: 3f718cd, Author: Frostyfrog, Committer: GitHub; Can not find "Frostyfrog 509363+TheTechmage@users.noreply.github.com", in ["Micah Peltier micah6_8@yahoo.com", "Colton Wolkins (Indicio work address) colton@indicio.tech", "Daniel Bluhm dbluhm@pm.me", "Colton Wolkins (Indicio work address) colton@indicio.tech", "Daniel Bluhm dbluhm@pm.me", "Colton Wolkins (Indicio work address) colton@indicio.tech", "Micah Peltier micah6_8@yahoo.com", "Colton Wolkins (Indicio work address) colton@indicio.tech", "Micah Peltier micah6_8@yahoo.com", "Colton Wolkins (Indicio work address) colton@indicio.tech", "Micah Peltier micah6_8@yahoo.com", "Colton Wolkins (Indicio work address) colton@indicio.tech", "Micah Peltier micah6_8@yahoo.com", "Colton Wolkins (Indicio work address) colton@indicio.tech", "Colton Wolkins (Indicio work address) colton@indicio.tech", "Daniel Bluhm dbluhm@pm.me", "Colton Wolkins (Indicio work address) colton@indicio.tech", "Micah Peltier micah6_8@yahoo.com", "Colton Wolkins (Indicio work address) colton@indicio.tech", "Micah Peltier micah6_8@yahoo.com", "Colton Wolkins (Indicio work address) colton@indicio.tech", "Micah Peltier micah6_8@yahoo.com", "Colton Wolkins (Indicio work address) colton@indicio.tech", "Micah Peltier micah6_8@yahoo.com", "Colton Wolkins (Indicio work address) colton@indicio.tech", "Micah Peltier micah6_8@yahoo.com", "Colton Wolkins (Indicio work address) colton@indicio.tech", "Colton Wolkins (Indicio work address) colton@indicio.tech", "Colton Wolkins (Indicio work address) colton@indicio.tech", "Colton Wolkins (Indicio work address) colton@indicio.tech", "Micah Peltier micah6_8@yahoo.com", "Micah Peltier micah6_8@yahoo.com", "Micah Peltier micah6_8@yahoo.com", "Colton Wolkins (Indicio work address) colton@indicio.tech", "Micah Peltier micah6_8@yahoo.com", "Micah Peltier micah6_8@yahoo.com", "Micah Peltier micah6_8@yahoo.com", "Micah Peltier micah6_8@yahoo.com", "Micah Peltier micah6_8@yahoo.com", "Micah Peltier micah6_8@yahoo.com", "Colton Wolkins (Indicio work address) colton@indicio.tech", "Colton Wolkins (Indicio work address) colton@indicio.tech", "Micah Peltier micah6_8@yahoo.com", "Micah Peltier micah6_8@yahoo.com", "Micah Peltier micah6_8@yahoo.com", "Micah Peltier micah6_8@yahoo.com", "Micah Peltier micah6_8@yahoo.com", "Micah Peltier micah6_8@yahoo.com", "Micah Peltier micah6_8@yahoo.com", "Micah Peltier micah6_8@yahoo.com", "Micah Peltier micah6_8@yahoo.com", "Colton Wolkins (Indicio work address) colton@indicio.tech", "Daniel Bluhm dbluhm@pm.me"].
Commit sha: 559b2f9, Author: Frostyfrog, Committer: GitHub; Expected "Frostyfrog 509363+TheTechmage@users.noreply.github.com", but got "Colton Wolkins (Indicio work address) colton@indicio.tech".
Commit sha: a4ad003, Author: jamshale, Committer: GitHub; Can not find "jamshale 31809382+jamshale@users.noreply.github.com", in ["jamshale jamiehalebc@gmail.com", "jamshale jamiehalebc@gmail.com", "jamshale jamiehalebc@gmail.com", "jamshale jamiehalebc@gmail.com", "jamshale jamiehalebc@gmail.com", "jamshale jamiehalebc@gmail.com"].
Commit sha: e5e12b8, Author: jamshale, Committer: GitHub; Can not find "jamshale 31809382+jamshale@users.noreply.github.com", in ["jamshale jamiehalebc@gmail.com", "jamshale jamiehalebc@gmail.com", "jamshale jamiehalebc@gmail.com", "jamshale jamiehalebc@gmail.com", "jamshale jamiehalebc@gmail.com", "jamshale jamiehalebc@gmail.com"].
Commit sha: 39f2b4f, Author: jamshale, Committer: GitHub; Can not find "jamshale 31809382+jamshale@users.noreply.github.com", in ["jamshale jamiehalebc@gmail.com", "jamshale jamiehalebc@gmail.com", "jamshale jamiehalebc@gmail.com", "jamshale jamiehalebc@gmail.com", "jamshale jamiehalebc@gmail.com", "jamshale jamiehalebc@gmail.com"].
Commit sha: 8d4ee58, Author: jamshale, Committer: GitHub; Can not find "jamshale 31809382+jamshale@users.noreply.github.com", in ["jamshale jamiehalebc@gmail.com", "jamshale jamiehalebc@gmail.com", "jamshale jamiehalebc@gmail.com", "jamshale jamiehalebc@gmail.com", "jamshale jamiehalebc@gmail.com", "jamshale jamiehalebc@gmail.com", "jamshale jamiehalebc@gmail.com", "jamshale jamiehalebc@gmail.com", "jamshale jamiehalebc@gmail.com"].
Commit sha: e949b02, Author: Lucas O'Neil, Committer: GitHub; Expected "Lucas O'Neil loneil@users.noreply.github.com", but got "Lucas ONeil lucasoneil@gmail.com".
Commit sha: 9e92e23, Author: Mourits de Beer, Committer: GitHub; Expected "Mourits de Beer 31511766+ff137@users.noreply.github.com", but got "ff137 ff137@proton.me".
Commit sha: a556d56, Author: Mourits de Beer, Committer: GitHub; Can not find "Mourits de Beer 31511766+ff137@users.noreply.github.com", in ["ff137 ff137@proton.me", "ff137 ff137@proton.me", "ff137 ff137@proton.me", "ff137 ff137@proton.me", "ff137 ff137@proton.me", "ff137 ff137@proton.me", "ff137 ff137@proton.me"].
Commit sha: d8490b9, Author: Mourits de Beer, Committer: GitHub; Can not find "Mourits de Beer 31511766+ff137@users.noreply.github.com", in ["ff137 ff137@proton.me", "ff137 ff137@proton.me", "ff137 ff137@proton.me"].
Commit sha: 314062b, Author: Mourits de Beer, Committer: GitHub; Can not find "Mourits de Beer 31511766+ff137@users.noreply.github.com", in ["ff137 ff137@proton.me", "ff137 ff137@proton.me", "ff137 ff137@proton.me"].
Commit sha: 926b3f5, Author: Patrick St-Louis, Committer: GitHub; Expected "Patrick St-Louis 43082425+PatStLouis@users.noreply.github.com", but got "pstlouis patrick.st-louis@opsecid.ca".