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

FABCN-391: Cherry pick relevant changes from master to release-2.0 #103

Merged
merged 9 commits into from
Mar 30, 2020

Conversation

heatherlp
Copy link
Contributor

No description provided.

@heatherlp heatherlp requested a review from a team as a code owner March 30, 2020 14:02
jt-nti and others added 9 commits March 30, 2020 15:24
Signed-off-by: James Taylor <jamest@uk.ibm.com>
Ammended all the node-engines in package.json to match
that in the docker image

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
Change-Id: Ia536ed66daf857679adf9f858b35d206a4f1007f
Signed-off-by: Andrew Hurt <andrew.hurt1@ibm.com>
It looks like rushjs symlinking can cause issues with the CopyFiles task. Use a script instead as suggested in microsoft/azure-pipelines-tasks#9046

Signed-off-by: James Taylor <jamest@uk.ibm.com>
Signed-off-by: Ry Jones <ry@linux.com>
Signed-off-by: lesleyannj <lesleyannj@hotmail.com>
Signed-off-by: lesleyannj <lesleyannj@hotmail.com>
Signed-off-by: lesleyannj <lesleyannj@hotmail.com>
Signed-off-by: Johnny Da Costa <johnny.dacosta@he-arc.ch>
Copy link
Member

@mbwhite mbwhite left a comment

Choose a reason for hiding this comment

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

LGTM

@mbwhite mbwhite merged commit ff0962f into hyperledger:release-2.0 Mar 30, 2020
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.

7 participants