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.

Sign up for GitHub

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

Jump to bottom

R4R:Record/query&download sub commands and implementation #336

Closed
wants to merge 319 commits into from
Closed

R4R:Record/query&download sub commands and implementation #336

wants to merge 319 commits into from

Conversation

yunkunrao
Copy link
Contributor

WIP:Record/query&download sub commands and implementation

zhangzhiqiang and others added 30 commits July 9, 2018 09:28
IRISHUB-34：irishub添加prometheus监控功能(添加p2p,memo监控，系统监控)
9bdc080
@zhangyelong
Merge pull request irisnet#25 from zhiqiang-bianjie/feature/prometheus
3f7bcb3 
IRISHUB-34：irishub添加prometheus监控功能(添加p2p,memo监控，系统监控)
@programokey
Merge pull request irisnet#2 from irisnet/feature/prometheus
973d134 
Feature/prometheus
@programokey
Merge branch 'feature/prometheus' of https://github.com/programokey/i…
658c3c2 
…rishub into feature/prometheus

Conflicts:
	tools/prometheus/server.go
@programokey
update commands
27eee21
@programokey
add some test cases of system/Metrics
c0a3995
@programokey
add some test cases of system/metrics.go
7a02562
@programokey
add monitor terms of disk usage, and support monitoring directories a…
f05af8f 
…nd files
@programokey
IRISHUB-32 add monitor terms of disk usage
adaa8d1
IRISHUB-34：irishub添加prometheus监控指标:consensus_candidates
f598c1a
@zhangyelong
Merge pull request irisnet#26 from programokey/feature/prometheus
3c62306 
add monitor terms of system usage
@zhangyelong
Merge pull request irisnet#27 from zhiqiang-bianjie/feature/prometheus
0580a47 
IRISHUB-34：irishub添加prometheus监控指标:consensus_candidates
Code optimization
d1c241c
Code clear
9801bbe
@programokey
Merge pull request irisnet#3 from irisnet/feature/prometheus
5c76146 
Feature/prometheus
@zhangyelong
Merge pull request irisnet#28 from zhiqiang-bianjie/feature/prometheus
f294d54 
Code optimization
@programokey
Merge pull request irisnet#4 from irisnet/feature/prometheus
36c3ccf 
Feature/prometheus
@programokey
IRISHUB-32 fixed the bug in system/metrics and add app.DefaultHome to…
5a9ac07 
… parameter paths' default value
@zhangyelong
Merge pull request irisnet#29 from programokey/feature/prometheus
6b26352 
Feature/prometheus
Code optimization
16f3179
@zhangyelong
Merge pull request irisnet#30 from zhiqiang-bianjie/feature/prometheus
6fcbf64 
Code optimization
@zhangyelong
Merge pull request irisnet#31 from irisnet/feature/prometheus
53ac635 
feature/prometheus
@zhangyelong
Revert "feature/prometheus"
b172d27
@zhangyelong
Merge pull request irisnet#32 from irisnet/revert-31-feature/prometheus
d4934d7 
Revert "feature/prometheus"
@zhangyelong
Merge pull request irisnet#33 from irisnet/feature/prometheus
b91a0ef 
feature/prometheus
Code optimization
07188a0
@zhangyelong
Merge pull request irisnet#34 from zhiqiang-bianjie/feature/prometheus
8205d78 
add packages
@zhangyelong
Merge pull request irisnet#35 from irisnet/feature/prometheus
8dd9b29 
Feature/prometheus
change bond token from steak to iris
bd8a3ca
@zhangyelong
Merge pull request irisnet#36 from zhiqiang-bianjie/develop
1f120bc 
change bond token from steak to iris
wukongcheng and others added 22 commits September 30, 2018 10:21
@wukongcheng
Merge pull request irisnet#342 from wukongcheng/silei/release0.5
5694d05 
R4R: bug fix for the software upgrade
@wukongcheng
Merge branch 'feature/docs' of https://github.com/irisnet/irishub int…
6c78fc9 
…o silei/release0.5
@wukongcheng
improve the software upgrade doc
78bdcab
@wukongcheng
Merge pull request irisnet#344 from irisnet/develop
e2db169 
Sync With Develop
@wukongcheng
Merge pull request irisnet#341 from irisnet/feature/docs
ac7df84 
WIP: Merge Feature/docs into Develop
@wukongcheng
Merge branch 'develop' of https://github.com/irisnet/irishub into sil…
4567a43 
…ei/release0.5
@wukongcheng
Merge pull request irisnet#345 from wukongcheng/silei/release0.5
b2ca38d 
Silei/release0.5
@wukongcheng
Merge pull request irisnet#346 from irisnet/feature/docs
e4d27fb 
R4R: Merge Feature/docs into Develop
@wukongcheng
release 0.5.0-rc0
342103c
@wukongcheng
Merge branch 'develop' of https://github.com/irisnet/irishub into sil…
3e09cbc 
…ei/release0.5
@wukongcheng
Merge pull request irisnet#347 from wukongcheng/silei/release0.5
2fbade6 
R4R: release 0.5.0-rc0
@trevorfu
Revert "test"
d16d1c7 
This reverts commit e20c7e6.
@trevorfu
Merge remote-tracking branch 'origin/develop' into yunkun
81bde4f
@yunkunrao
Refactor ipfs client implementation
764fca2
@yunkunrao
Merge branch 'yunkun' of github.com:wancloud-cosmos/irishub into yunkun
9372f32
@bahuang @yunkunrao
test
66395cd
@trevorfu @yunkunrao
irishub.iml ignore
4a79e57
@yunkunrao
Init record module
4ac243b
@yunkunrao
Add query and download subcmd for iriscli
b2c965c 
add cmd record submit subcommand
@trevorfu @yunkunrao
Revert "test"
807a868 
This reverts commit e20c7e6.
@yunkunrao
Refactor ipfs client implementation
127cc07
@yunkunrao
Merge with origin/develop branch.
72e8edb
wukongcheng
wukongcheng suggested changes Oct 8, 2018
View reviewed changes
Copy link
Contributor

@wukongcheng wukongcheng left a comment

Choose a reason for hiding this comment

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

Split the PR. One for syncing the develop branch and another one for the record module change set.

@yunkunrao
Revert "Merge with origin/develop branch."
6e2c5d8 
This reverts commit 72e8edb, reversing
changes made to 127cc07.
@yunkunrao
Revert "Merge branch 'yunkun' of github.com:wancloud-cosmos/irishub i…
4495121 
…nto yunkun"

This reverts commit 9372f32, reversing
changes made to 764fca2.
@yunkunrao
Copy link
Contributor Author

As we discussed, I will recreate a new PR which is only for record feature code changes.

@yunkunrao yunkunrao closed this Oct 8, 2018
@yunkunrao yunkunrao deleted the yunkun branch October 8, 2018 12:11
This was referenced Apr 19, 2024
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wukongcheng wukongcheng wukongcheng requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@yunkunrao @trevorfu @wukongcheng @zhangyelong @programokey @kidinamoto01 @MrXJC @shirleypyj @bahuang