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

merge from develop #915

Merged
merged 28 commits into from
May 31, 2018
Merged

merge from develop #915

merged 28 commits into from
May 31, 2018

Conversation

zhaohong
Copy link
Contributor

What does this PR do?

Why are these changes required?

This PR has been tested by:

  • Unit Tests
  • Manual Testing

Follow up

Extra details

taihaofu and others added 28 commits May 28, 2018 17:29
@taihaofu
add wallet extension service
2ba20c3
@sasaxie
Merge commit '2998ca987e6c7c10268f5b0c6ebcf4f0cc299a13' into develop
542edfd
@huzhenyuan
Merge pull request #58 from tronprotocol/update_proto_for_walletExten…
e62a2e0 
…sion_service

add wallet extension service
@nanfengpo
Merge branch 'master' into add_total_net_api
535f47d
@sasaxie
Merge branch 'develop' of github.com:tronprotocol/java-tron into develop
f412897
@sasaxie
Merge branch 'develop' of github.com:tronprotocol/java-tron into develop
690f9a7
@sean-liu55
Merge pull request #59 from tronprotocol/add_total_net_api
efc94f0 
Add total net api
@sasaxie
Merge branch 'develop' of github.com:tronprotocol/java-tron into develop
dca9476
@sasaxie
Merge branch 'develop' of github.com:tronprotocol/java-tron into develop
0569a74
@sasaxie
Merge branch 'develop' of github.com:tronprotocol/java-tron into develop
d67581f
@CodeNinjaEvan
fix:remove api.
da7abeb
Delete query api case
03db7b5
@CodeNinjaEvan
feat: remove api.
abbe0ce
@CodeNinjaEvan
Merge pull request #60 from tronprotocol/rm_api
cb1ed99 
feat: remove api.
@CodeNinjaEvan
fix:remove api.
9a51f18
@CodeNinjaEvan
Merge commit 'cb1ed99827611cb0eb6aba0eb28220f4bdcf80c6' into rm_api
a1d793e 
# Conflicts:
#	src/main/protos/api/api.proto
Delete query by timestmpe api case
d1023fc
@CodeNinjaEvan
Merge pull request #909 from tronprotocol/rm_api
446eaa7 
Rm api
@CodeNinjaEvan
feat:add time out when generate Block.
8d36ad4
@CodeNinjaEvan
Merge pull request #910 from tronprotocol/add_time_out
c42bdcd 
feat:add time out when generate Block.
@xxo1shine
mdf syncpool
e6456c6
@xxo1shine
bean loop check
f7b8356
@lvs007
Merge pull request #911 from tronprotocol/p2p
7f77d4d 
p2p: bean import problem
@sasaxie
Merge branch 'develop' of github.com:tronprotocol/java-tron into develop
acf379e
@sasaxie
fix block size overflow
1919d8a
update witness address
d78970f
@zergweak
Merge pull request #914 from tronprotocol/update_version
b30d68b 
update witness address
@zhaohong
Merge pull request #913 from tronprotocol/fix-block-size-overflow
0d60786 
Fix block size overflow
@zhaohong zhaohong merged commit 95dc536 into master May 31, 2018
@kaankozan kaankozan mentioned this pull request May 31, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@zhaohong @taihaofu @sasaxie @huzhenyuan @nanfengpo @sean-liu55 @CodeNinjaEvan @xxo1shine @lvs007 @zergweak