Skip to content

merge develop to master#8

Merged
tronfoundation merged 44 commits intomasterfrom
develop
Dec 28, 2017
Merged

merge develop to master#8
tronfoundation merged 44 commits intomasterfrom
develop

Conversation

@tronfoundation
Copy link
Contributor

fix

@tronfoundation tronfoundation merged commit 1a16294 into master Dec 28, 2017
tronfoundation added a commit that referenced this pull request Dec 28, 2017
Merge pull request #8 from tronprotocol/develop
zhaohong pushed a commit that referenced this pull request Feb 5, 2018
 XpP48QHnoDPrUwFCjwisbvX0cpRLbqblP8lQmt06UCE7umBEU1drNLJMobaTh44v
 qpDgXkbGH7EP18a4LxDQFWc/xNDxld3cyryAhc2v1ITIe7CILbDVy39RXfTd1GIe
 vknNNGaIJXkYTX/eajOcDDAiWOdNwqb06KZiFMhtSCLGX/28sTKvc8oP31EbpNFg
 E2zo3p4h+cd0s3ri8wI++baO2IuoUCwQSSJYEduFLCgk+Ql95RDbLHGnK07yvPDC
 8oYaIW6lEFyQHhlKQFVYnUsWzhVXQod1O8z7buvNO0Te48PTuuGlUeIGrn4FEt8=
 =FSyK
 -----END PGP SIGNATURE-----
 

Merge pull request #8 from tronprotocol/develop

merge develop to master
zhaohong pushed a commit that referenced this pull request Feb 5, 2018
 u7gadu9AcwZgiDq+U+jfsIrWlKqMcE7h6ze1Fen+6LAnvj4cHwoZ44CxXRRWUEdU
 0K05ySqYwdP/YV++KjTIc7lNBwpTaTezhF9OXeYpfZ2EOnkKftaB51P0REIwvqz8
 NE/2y5SV8lg4CHqO2KZKvqbrAaVAx3s4SXevCAEgY3v5DVu62MzhIMRGZWp/KgSG
 xn8z2YDEc913Rdde+OPyNEoHW86jaPYeRB0mSL3VBbE5yILsKzhnxrT2iGa17s5s
 h5OHcE28WKL/rOF8mtcI9ZZG9V9EqYZ5hT+P5aXdYEUtkqzDrAFrbE2EmffcTUc=
 =MwaS
 -----END PGP SIGNATURE-----
 

Merge pull request #9 from tronprotocol/master

Merge pull request #8 from tronprotocol/develop
CodeNinjaEvan pushed a commit that referenced this pull request Mar 20, 2018
shydesky pushed a commit that referenced this pull request Dec 7, 2019
jiangyy0824 pushed a commit that referenced this pull request Dec 23, 2019
halibobo1205 added a commit that referenced this pull request Feb 27, 2023
yanghang8612 pushed a commit to yanghang8612/java-tron that referenced this pull request Jan 4, 2026
…pool_close_opt

fix(backup): make SR node with backup exit normally by kill -15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants