5 commits

Author	SHA1	Message	Date
Srinivasan Muralidharan	ec254d983c	Merge "FAB-4916 add marbles02 chaincode"	2017-06-23 11:54:14 +00:00
Christopher Ferris	ca0b5d2882	FAB-4916 add marbles02 chaincode ... couchdb mode requires marbles02 chaincode Change-Id: I0c329e8d42fd72f656e292815d1ba5790f4b709c Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>	2017-06-23 04:16:14 +00:00
Gari Singh	b4beeffd32	[FAB-4927] Modify TLS config ... Last part of FAB-4626- need to update the script to use the right root CA for communciating with the orderer. Change-Id: I89e1468be6970b48c416f7058dd38c24b0eec506 Signed-off-by: Gari Singh <gari.r.singh@gmail.com>	2017-06-22 22:06:00 -04:00
Christopher Ferris	241d08ee3c	FAB-4910 fix incorrect network spec ... and fix incorrect function name in byfn.sh add *.tx and *.block files to .gitignore add FABRIC_CFG_PATH setting Change-Id: Id3457455354b1f2aea1a9661aa89dc677e05124b Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com> Signed-off-by: Rameshbabu <rameshbabu.thoomu@gmail.com>	2017-06-22 09:09:53 +08:00
Christopher Ferris	3297865248	FAB-4073 build your first network sample ... address review comments Change-Id: Ia2382005d4503f9dc7ba845a2d04f36237316cde Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>	2017-06-21 05:42:36 +00:00