Merge 2.3 #227
Merged
Merge 2.3 #227
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Brett Logan <[email protected]>
Signed-off-by: James Taylor <[email protected]>
Tag needs to include hyperledger to match the publish command Signed-off-by: James Taylor <[email protected]>
Signed-off-by: James Taylor <[email protected]>
Signed-off-by: James Taylor <[email protected]>
Signed-off-by: James Taylor <[email protected]>
Signed-off-by: James Taylor <[email protected]>
Temporarily raise audit level to moderate to work around current minimist audit failures Can be reverted after grpc, rc, and tar dependecies have been updated to pull in updated versions of mkdirp and minimist Signed-off-by: James Taylor <[email protected]>
Signed-off-by: James Taylor <[email protected]>
Signed-off-by: heatherlp <[email protected]>
Signed-off-by: heatherlp <[email protected]>
Signed-off-by: James Taylor <[email protected]>
Ammended all the node-engines in package.json to match that in the docker image Signed-off-by: Matthew B White <[email protected]> Change-Id: Ia536ed66daf857679adf9f858b35d206a4f1007f
Signed-off-by: Andrew Hurt <[email protected]>
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 <[email protected]>
Signed-off-by: Ry Jones <[email protected]>
Signed-off-by: lesleyannj <[email protected]>
Signed-off-by: lesleyannj <[email protected]>
Signed-off-by: lesleyannj <[email protected]>
Signed-off-by: Johnny Da Costa <[email protected]>
FABCN-391: Cherry pick relevant changes from master to release-2.0
- reflect this in compatibility.md - update some out of date tutorial lines Signed-off-by: heatherlp <[email protected]>
FABCN-391 Set docker images to use node 10
Signed-off-by: heatherlp <[email protected]>
FABCN-391 Build against release-2.x
- replace with 2.x Signed-off-by: heatherlp <[email protected]>
FABCN-391 Remove references to 2.0 and 2.0.0
Set node engine to be the latest LTS at time of commit 12.6.1 Due to issues with comibation of the 12.6 and rewire, unit tests are run with node 12.5.0 Updated timeout as Typescript compilation seems to have slowed down. Signed-off-by: Matthew B White <[email protected]>
Update to use Node 12.16.1
Signed-off-by: James Taylor <[email protected]>
@grpc/grpc-js updated to 1.1.0; this has caused the initial request to the peer on chaincode start to fail. Dropping back to 1.0.3 resolves the issue. See FABCN-415 Signed-off-by: Matthew B White <[email protected]>
For resolving grpc version dependency Signed-off-by: Matthew B White <[email protected]>
Work around for issue winstonjs/winston#1814 Signed-off-by: James Taylor <[email protected]>
Signed-off-by: James Taylor <[email protected]>
This patch fixes broken links to the fabric documents. This patch also fixes links to point to those for the proper version (2.1). Signed-off-by: Taku Shimosawa <[email protected]>
Signed-off-by: James Taylor <[email protected]>
- Update grpc-js and winston to pre-lock levels - General update of dependcies - Note add about shirnkwrap. - Corrected test cases Signed-off-by: Matthew B White <[email protected]>
Used new coverage merge tool to joing coverage together Signed-off-by: Matthew B White <[email protected]>
Fabric 2.2 removes official support for CouchDB 2.x. The migration to 3.1 was to address fsync issues in the underlying storage implementation in Couch. This change moves to CouchDB 3.1 which requires the user to now set an admin identity at startup. Node 12.18.2 is the latest LTS Signed-off-by: Brett Logan <[email protected]>
Signed-off-by: Matthew B White <[email protected]>
Signed-off-by: James Taylor <[email protected]>
Signed-off-by: winderica <[email protected]>
Signed-off-by: James Taylor <[email protected]>
Need current supported levels. Signed-off-by: Matthew B White <[email protected]>
Signed-off-by: lesleyannj <[email protected]>
Incorrect trace point logging entire binary message Signed-off-by: Matthew B White <[email protected]>
Signed-off-by: Kestutis Gudynas <[email protected]>
…ger#209) This patch fixes the type definition for the second field in the Timestamp, which is actually Long (int64). Signed-off-by: Taku Shimosawa <[email protected]> Co-authored-by: Matthew B White <[email protected]> Co-authored-by: Taku Shimosawa <[email protected]>
* [FABCN-241] Remove to.be.ok Signed-off-by: lesleyannj <[email protected]> * [FABCN-1627]-Update class transformer dependency Signed-off-by: lesleyannj <[email protected]>
Signed-off-by: Kestutis Gudynas <[email protected]>
Signed-off-by: Kestutis Gudynas <[email protected]>
Signed-off-by: James Taylor <[email protected]> # Conflicts: # CHANGELOG.md # COMPATIBILITY.md # TUTORIAL.md # apis/fabric-contract-api/README.md # apis/fabric-contract-api/package.json # apis/fabric-contract-api/test/unit/metadata.json # apis/fabric-shim-api/README.md # apis/fabric-shim-api/package.json # ci/azure-pipelines.yml # common/config/rush/pnpm-lock.yaml # docs/_config.yml # docs/_includes/header.html # docs/_jsdoc.json # docs/_jsdoc/index.md # docs/_jsdoc/tutorials/annotated-contract-metadata.md # docs/_jsdoc/tutorials/deep-dive-contract-interface.md # docs/_jsdoc/tutorials/using-chaincodeinterface.md # docs/_jsdoc/tutorials/using-contractinterface.md # docs/_jsdoc/tutorials/using-iterators.md # docs/index.md # docs/package.json # libraries/fabric-shim-crypto/README.md # libraries/fabric-shim-crypto/package.json # libraries/fabric-shim/README.md # libraries/fabric-shim/lib/contract-spi/chaincodefromcontract.js # libraries/fabric-shim/package.json # libraries/fabric-shim/test/unit/contract-spi/chaincodefromcontract.js # libraries/fabric-shim/test/unit/server.js # package.json # release_notes/v2.0.0.txt # test/chaincodes/annotations/package.json # test/chaincodes/annotations/src/test_contract/expected-metadata.json # test/chaincodes/clientidentity/package.json # test/chaincodes/crosschaincode/package.json # test/chaincodes/crosschaincode2/package.json # test/chaincodes/crud/package.json # test/chaincodes/encryption/package.json # test/chaincodes/events/package.json # test/chaincodes/query/package.json # test/chaincodes/scenario/package.json # test/chaincodes/server/package.json # test/e2e/scenario.js # test/fv/package.json # tools/getEdgeDocker.sh # tools/toolchain/fabric.js # tools/toolchain/network/docker-compose/docker-compose-base.yaml
mbwhite
approved these changes
Nov 10, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.