Commit Graph

467 Commits (9e0ae1084b8cfe1a7b4a49138e7f462f5f521927)
 

Author SHA1 Message Date
Baohua Yang 5a50c84461 Merge pull request #86 from qiang0723/master
Fix makefile
2017-07-23 20:35:54 +08:00
qiang0723 ff399e3b13 update makefile 2017-07-21 16:32:29 +08:00
Baohua Yang ed917fc719 Enable makefile support 2017-07-21 15:24:49 +08:00
Baohua Yang c31e41578a Update script names 2017-07-21 13:59:59 +08:00
Baohua Yang 90dd7fee2f Update official scripts and docs 2017-07-21 13:19:01 +08:00
Baohua Yang 1d3d6a3e54 Merge pull request #85 from qiang0723/master
Update docs
2017-07-13 18:37:29 +08:00
qiang0723 0c0e044ae7 Update docs 2017-07-13 16:33:18 +08:00
Baohua Yang a54f3c9f11 Merge pull request #84 from qiang0723/master
Add configtxlator usage
2017-07-13 11:55:46 +08:00
qiang0723 45010976a1 [WIP]add configtxlator usage 2017-07-12 17:43:24 +08:00
Baohua Yang 5b101de708 Merge pull request #83 from qiang0723/master
Update images to 1.0.0 and modify scripts
2017-07-12 16:14:43 +08:00
qiang0723 0fbe522500 Modify scripts 2017-07-12 12:29:15 +08:00
qiang0723 63e023c3a6 Update images version to 1.0.0 2017-07-12 11:52:27 +08:00
Baohua Yang f7c5634bb3 Merge pull request #82 from qiang0723/master
Add usage of kafka
2017-07-11 23:04:33 +08:00
qiang0723 92c97e5343 Merge branch 'master' into master 2017-07-11 14:03:41 +08:00
Baohua Yang 48f5699459 Add cleanup_env scripts and update doc 2017-07-10 17:24:19 +08:00
qiang0723 1bc51b63dd [WIP] Add usage of kafka 2017-07-10 17:19:29 +08:00
Baohua Yang 3a098625a6 Merge pull request #78 from qiang0723/master
Enable orderer-kafka
2017-07-06 17:03:08 +08:00
qiang0723 64a50f6d1b Merge branch 'master' into master 2017-07-06 13:25:12 +08:00
Baohua Yang 4b047aa2ea Merge pull request #77 from hiberabyss/master
Remove unused code
2017-07-06 12:45:58 +08:00
qiang0723 947be5a452 Fix bugs 2017-07-06 11:43:46 +08:00
qiang0723 c55f6ba9b5 Enable orderer-kafka 2017-07-06 11:31:04 +08:00
Hongbo Liu 3674ba1de3 remove useless code 2017-07-06 10:21:30 +08:00
Baohua Yang 3f88954fa2 Merge pull request #76 from qiang0723/master
Change instantiate peer in initialize.sh
2017-06-29 22:10:41 +08:00
qiang0723 5e8efafbe9 Change instantiate peer initialize.sh 2017-06-29 15:52:35 +08:00
Baohua Yang c3b18e3b1d Merge pull request #75 from qiang0723/master
Use v1.0.0-rc1 images
2017-06-29 15:22:43 +08:00
qiang0723 5f8e33d5a0 Testing v1.0.0-rc1 images 2017-06-29 10:14:43 +08:00
qiang0723 765c6c7127 Update download scripts 2017-06-27 19:24:06 +08:00
Baohua Yang aa82a4d183 Merge pull request #73 from qiang0723/master
Update crypto-config
2017-06-26 21:38:23 +08:00
qiang0723 5a97ae690e Update crypto-config 2017-06-26 11:23:59 +08:00
Baohua Yang 7e9cc545f0 Merge pull request #70 from qiang0723/master
Update crypto-config and channel-artifacts
2017-06-23 20:42:32 +08:00
qiang0723 0b2aa5bd01 Update crypto-config and channel-artifacts 2017-06-23 18:44:44 +08:00
Baohua Yang 25a7ad8d1c Update tlsca path 2017-06-23 10:59:32 +08:00
Baohua Yang a3bd35f0e5 Update crypto-config files 2017-06-23 10:46:40 +08:00
Baohua Yang 8b6a7c2113 Merge branch 'master' of github.com:yeasy/docker-compose-files 2017-06-23 10:46:23 +08:00
Baohua Yang 9041e88c74 Update crypto-config files 2017-06-23 10:46:20 +08:00
Baohua Yang f6377d1e14 Merge pull request #69 from qiang0723/master
Add  couchdb support
2017-06-22 18:18:05 +08:00
qiang0723 2e11567591 Add usage of couchdb 2017-06-22 17:58:40 +08:00
Baohua Yang 6742253bf4 Remove unused flags 2017-06-21 20:52:24 +08:00
Baohua Yang f262f5285c Merge pull request #66 from qiang0723/master
Sync official compose file
2017-06-21 20:45:30 +08:00
qiang0723 202b8516d5 Sync official compose file 2017-06-21 15:51:41 +08:00
Baohua Yang 5b5e0242f3 Merge pull request #64 from qiang0723/master
Update docs structure
2017-06-17 14:57:21 +08:00
qiang0723 3342e619a4 Update docs 2017-06-16 18:53:28 +08:00
Baohua Yang fe3251020e Merge pull request #63 from qiang0723/master
Update docker-compose-1peer.yaml
2017-06-16 17:46:06 +08:00
qiang0723 604e02174b Modify docker-compose-1peer.yaml 2017-06-16 15:56:25 +08:00
Baohua Yang 760bf4c0a8 Merge pull request #62 from qiang0723/master
Support colorful cmd for test scripts
2017-06-15 09:53:25 +08:00
qiang0723 a83a419258 add colorful cmd for test scripts 2017-06-14 13:30:12 +08:00
Baohua Yang 9f0b6625c9 Disable tls for event listener 2017-06-13 22:10:45 +08:00
Baohua Yang 23f08181d5 Merge pull request #59 from gymgle/master
Fix noops network
2017-06-13 22:07:11 +08:00
Baohua Yang 7bd41670dc Merge pull request #61 from qiang0723/master
Enable TLS by default
2017-06-13 22:06:48 +08:00
qiang0723 fe6b6bedc4 Enable TLS 2017-06-13 17:40:28 +08:00