erigon-pulse/to-merge.txt
gary rong 259417e9e2 les: close all connected les-server when shutdown (#21426)
* les: close all connected les-server when shutdown

* les: linter nitpick

Co-authored-by: Martin Holst Swende <martin@swende.se>
# Conflicts:
#	les/peer.go
#	les/server.go
#	les/server_handler.go
2020-08-14 16:48:31 +02:00

82 lines
2.4 KiB
Plaintext

commit 3e0641923d78bf1905e596a3a41a54277540bec7
Author: Péter Szilágyi <peterke@gmail.com>
Date: Tue Aug 11 14:10:21 2020 +0300
params: release Geth v1.9.19
commit 74925e547fe11fff8adf9a47683b90f062cc1734
Merge: c28fd9c07 7afdf792a
Author: Péter Szilágyi <peterke@gmail.com>
Date: Tue Aug 11 10:34:08 2020 +0300
Merge pull request #21437 from karalabe/cht-1.9.19
params: update CHTs for v1.9.19
commit 7afdf792ab88ff61b0c68ba4939039beae51482f
Author: Péter Szilágyi <peterke@gmail.com>
Date: Tue Aug 11 10:20:03 2020 +0300
params: update CHTs for v1.9.19
commit c28fd9c0792dd85784073b7398dedc3d7a3d710a
Author: Martin Holst Swende <martin@swende.se>
Date: Mon Aug 10 21:06:14 2020 +0200
tests: add Berlin-definition identical to YOLOv1 (#21435)
commit 4baa574410ece6e022068523091fd6e6ceb11369
Merge: cbbc54c49 9f45d6efa
Author: Péter Szilágyi <peterke@gmail.com>
Date: Mon Aug 10 15:13:31 2020 +0300
Merge pull request #21434 from karalabe/ethstats-split-rwlock
ethstats: split read and write lock, otherwise they'll lock up
commit 9f45d6efae611ef87202a7d699158a2fdc3682cf
Author: Péter Szilágyi <peterke@gmail.com>
Date: Mon Aug 10 14:33:22 2020 +0300
ethstats: split read and write lock, otherwise they'll lock up
commit cbbc54c4956968ef240ec2610444bb30b74333a0
Merge: 48b484c5a 7cee2509c
Author: Péter Szilágyi <peterke@gmail.com>
Date: Mon Aug 10 12:08:46 2020 +0300
Merge pull request #21433 from holiman/statsync_exiter
eth/downloader: allow all timers to exit
commit 7cee2509c07e5514dc7647fcf8a4f066feaaa6df
Author: Martin Holst Swende <martin@swende.se>
Date: Mon Aug 10 10:42:33 2020 +0200
eth/downloader: allow all timers to exit
commit 48b484c5ac537d1759c9903ce81302c298f03a84
Merge: 06125bff8 6a53ce29a
Author: Péter Szilágyi <peterke@gmail.com>
Date: Fri Aug 7 19:40:28 2020 +0300
Merge pull request #21428 from holiman/ethstats_moar
ethstats: overwrite old errors
commit 06125bff89fd08ba16ff5b2fbb173ed22e9a7137
Merge: e401f5ff1 9fea1a5cf
Author: Péter Szilágyi <peterke@gmail.com>
Date: Fri Aug 7 16:36:33 2020 +0300
Merge pull request #21429 from holiman/timerfix
eth/downloader: set deliverytime on drops and timeouts too
commit 9fea1a5cf5a0f833f30a27ca0b60c0d71b71b062
Author: Martin Holst Swende <martin@swende.se>
Date: Fri Aug 7 15:31:17 2020 +0200
eth/downloader: set deliverytime on drops and timeouts too