diff --git a/to-merge.txt b/to-merge.txt index a8f16dc32d11c81fdd93b6805d10bc9609091c73..222935927dc29ac96b0b031db4c281d73a5a1c1d 100644 --- a/to-merge.txt +++ b/to-merge.txt @@ -338,48 +338,3 @@ Date: Wed Jul 29 14:53:59 2020 -0500 core/rawdb: convert some comments to godoc convention (#21384) -commit 9e04c5ec83cbbb227e63e53d3cd08d97e5f2a874 -Author: ucwong <ucwong@126.com> -Date: Wed Jul 29 19:49:12 2020 +0800 - - core/bloombits: use single channel for shutdown (#20878) - - This replaces the two-stage shutdown scheme with the one we - use almost everywhere else: a single quit channel signalling - termination. - - Co-authored-by: Felix Lange <fjl@twurst.com> - -commit abf2d7d74ff4a5e66f5e1f78af413b7f66a4c269 -Author: Julian Y <jyap808@users.noreply.github.com> -Date: Wed Jul 29 03:48:03 2020 -0700 - - build: use -trimpath flag when building executables (#21374) - - * Disable symbol table and DWARF generation by default. - Trimpath if compiling with Go >= 1.13 - - * Set Go to minimum version 1.13. Revert debug symbol changes. - -commit 1976bb3df0171f8bbcca168e93642a5427d1d4a5 -Author: rene <41963722+renaynay@users.noreply.github.com> -Date: Wed Jul 29 12:47:19 2020 +0200 - - eth/downloader: remove eth62 (#21378) - - * init - - notes - - removed some mentions of eth62, bumped protocol err too old to >=63 - - * remove sanity checks and bump supported protocol version up to 63 - - * remove 62 tests, still need to add 65 - - * remove 65 tests - - - - -