Merge branch 'master' into remove_short_names_2

This commit is contained in:
Julian Castrence 2020-12-18 12:58:39 -05:00
commit f617d061a9
2 changed files with 3 additions and 3 deletions

View file

@ -13,7 +13,7 @@ starttime=$(date +%s)
pushd ../test-network pushd ../test-network
./network.sh down ./network.sh down
./network.sh up createChannel -ca -s couchdb ./network.sh up createChannel -ca -s couchdb
./network.sh deployCC ./network.sh deployCC -ccn basic -ccp ../asset-transfer-basic/chaincode-go/ -ccl go
popd popd

View file

@ -30,7 +30,7 @@ createChannelTx() {
} }
createAncorPeerTx() { createAnchorPeerTx() {
for orgmsp in Org1MSP Org2MSP; do for orgmsp in Org1MSP Org2MSP; do
@ -119,7 +119,7 @@ createChannelTx
## Create anchorpeertx ## Create anchorpeertx
infoln "Generating anchor peer update transactions" infoln "Generating anchor peer update transactions"
createAncorPeerTx createAnchorPeerTx
FABRIC_CFG_PATH=$PWD/../config/ FABRIC_CFG_PATH=$PWD/../config/