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.

Sign up for GitHub

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

Jump to bottom

FAB-17243 Add support for Fabric CA for Org3 #91

Merged
merged 2 commits into from
Jan 16, 2020
Merged

FAB-17243 Add support for Fabric CA for Org3 #91

merged 2 commits into from
Jan 16, 2020

Conversation

nikhil550
Copy link
Contributor

@nikhil550 nikhil550 commented Dec 18, 2019 •
edited
Loading

FAB-17243 Add support for Fabric CA for Org3 on the Test Network

Other fixes and improvements:

  • FAB-17264 - Updating the chaincode language from node to javascript in help text
  • FAB-17242 - Adding README with instructions to addOrg3 folder
  • Adding support for org3 connection profile
  • Adding link to test network tutorial in main README
  • Removing second peer from org1 and org2 connection profiles.
  • Fixing scripting errors.
  • Move golang chaincode vendoring to chaincode script and build java chaincode
  • check if the network is up using the certs rather than docker containers, which was causing errors.

Signed-off-by: NIKHIL E GUPTA negupta@us.ibm.com

@nikhil550 nikhil550 marked this pull request as ready for review December 18, 2019 15:22
@nikhil550 nikhil550 force-pushed the FAB-17243 branch 2 times, most recently from f21697c to 24caa1d Compare December 18, 2019 21:35
@nikhil550 nikhil550 changed the title FAB-17243 Add support for Fabric CA for Org3 on the FAB-17243 Add support for Fabric CA for Org3 Dec 18, 2019
@nikhil550 nikhil550 force-pushed the FAB-17243 branch 2 times, most recently from 5c7c6c4 to 6ba7108 Compare January 15, 2020 14:40
@nikhil550 nikhil550 mentioned this pull request Jan 15, 2020
Merged
lehors
lehors suggested changes Jan 16, 2020
View reviewed changes
Copy link
Contributor

@lehors lehors left a comment

Choose a reason for hiding this comment

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

A few nits, otherwise this LGTM. I tried it and it ran as expected.

test-network/README.md Outdated Show resolved Hide resolved
test-network/README.md Outdated Show resolved Hide resolved
test-network/addOrg3/addOrg3.sh Outdated Show resolved Hide resolved
FAB-17243 Add support for Fabric CA for Org3 on the
f05464b 
test network.

Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
@lehors lehors merged commit b3b5267 into hyperledger:master Jan 16, 2020
@nikhil550 nikhil550 deleted the FAB-17243 branch March 20, 2020 15:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lehors lehors lehors approved these changes

@christo4ferris christo4ferris Awaiting requested review from christo4ferris

@denyeart denyeart Awaiting requested review from denyeart

@harrisob harrisob Awaiting requested review from harrisob

@jyellick jyellick Awaiting requested review from jyellick

@mastersingh24 mastersingh24 Awaiting requested review from mastersingh24

@mbwhite mbwhite Awaiting requested review from mbwhite

@sstone1 sstone1 Awaiting requested review from sstone1

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@nikhil550 @lehors