Skip to content

chore: pulled in original sources - v2 #3

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

Closed

Conversation

petermetz
Copy link
Contributor

This is the second attempt of a similar PR from before.
Contains the code donated by Accenture as part of the lab
Commit history could not be kept due to lack of signatures.
List of contributors were attached in the README as thanks to the original contributors.
READMEs were merged: first the proposal README, then the original readme from Accenture.
The contents in this PR are taken from the dev branch of the original internal Accenture code repository.
Originating commit from the Accenture private repository:
commit 5caf10aa0003d98403992ce22c0a3699fe6e59ee (HEAD -> release/github, origin/release/github)
Author: hugo.borne-pons [email protected]
Date: Wed Oct 23 16:16:24 2019 +0200
Originating commit was produced by rebasing the develop branch onto master with an aggressive theirs merge strategy.

This is the second attempt of a similar PR from before.
Contains the code donated by Accenture as part of the lab
Commit history could not be kept due to lack of signatures.
List of contributors were attached in the README as thanks to the original contributors.
READMEs were merged: first the proposal README, then the original readme from Accenture.
The contents in this PR are taken from the dev branch of the original internal Accenture code repository.
Originating commit from the Accenture private repository:
  commit 5caf10aa0003d98403992ce22c0a3699fe6e59ee (HEAD -> release/github, origin/release/github)
  Author: hugo.borne-pons <[email protected]>
  Date:   Wed Oct 23 16:16:24 2019 +0200
Originating commit was produced by rebasing the develop branch onto master with an aggressive theirs merge strategy.

Signed-off-by: Peter Somogyvari <[email protected]>
This commit was produced by copying over the files/folders recursively
from the private Accenture repository which was on the commit:
------------------------------------------------------------------------
Commit: fce7bfb281d719fe41b15f90fb721ed525a9dba6
Parents: 80e17819bd280d48867dc1efc53c5ef57293c346
Author: hugo.borne-pons <[email protected]>
Date: Thu Oct 24 2019 05:21:20 GMT-0700 (Pacific Daylight Time)
Committer: hugo.borne-pons
------------------------------------------------------------------------

Signed-off-by: Peter Somogyvari <[email protected]>
@petermetz petermetz force-pushed the chore/original-sources-v2 branch from f88845b to a5094ba Compare October 25, 2019 00:06
@petermetz
Copy link
Contributor Author

Abandoning this one until due process is finished.

@petermetz petermetz closed this Oct 25, 2019
@petermetz petermetz deleted the chore/original-sources-v2 branch October 25, 2019 18:50
twiggins120 added a commit to twiggins120/cactus that referenced this pull request Jun 17, 2021
twiggins120 added a commit to twiggins120/cactus that referenced this pull request Jul 23, 2021
petermetz pushed a commit that referenced this pull request Jul 24, 2021
hanxu12 pushed a commit to hanxu12/cactus that referenced this pull request Jul 26, 2021
rachel2code added a commit to rachel2code/cactus that referenced this pull request Oct 1, 2021
rachel2code added a commit to rachel2code/cactus that referenced this pull request Oct 1, 2021
rachel2code added a commit to rachel2code/cactus that referenced this pull request Oct 1, 2021
petermetz pushed a commit to rachel2code/cactus that referenced this pull request Nov 24, 2021
Fixes hyperledger-cacti#1352

Signed-off-by: rachel2code <[email protected]>
Signed-off-by: Peter Somogyvari <[email protected]>
petermetz pushed a commit to rachel2code/cactus that referenced this pull request Nov 24, 2021
Fixes hyperledger-cacti#1352

Signed-off-by: rachel2code <[email protected]>
Signed-off-by: Peter Somogyvari <[email protected]>
petermetz pushed a commit that referenced this pull request Nov 25, 2021
Fixes #1352

Signed-off-by: rachel2code <[email protected]>
Signed-off-by: Peter Somogyvari <[email protected]>
RafaelAPB referenced this pull request in RafaelAPB/blockchain-integration-framework Mar 9, 2022
ryjones pushed a commit that referenced this pull request Feb 1, 2023
Update from Hyperledger-labs
ryjones pushed a commit that referenced this pull request Feb 1, 2023
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.

1 participant