diff --git a/to-merge.txt b/to-merge.txt index 44627f6fc7d04ab4e3b3d127ca1053c3cd71f986..d727ea96d7e1b2592591c8f920ae5c47227d6df3 100644 --- a/to-merge.txt +++ b/to-merge.txt @@ -351,152 +351,4 @@ commit 5cdc2dffda5af375bd5e26216c525159354022aa Author: Gary Rong <garyrong0905@gmail.com> Date: Wed May 6 21:33:57 2020 +0800 - trie: fix TestBadRangeProof unit test (#21034) - -commit c2147ee154b4d638c3b241fce0b1e185b72c0c2b -Author: ploui <64719999+ploui@users.noreply.github.com> -Date: Wed May 6 06:01:01 2020 -0400 - - eth: don't inadvertently enable snapshots in archive nodes (#21025) - - * eth: don't reassign more cache than is being made available - - * eth: don't inadvertently enable snapshot in a case where --snapshot wasn't given - -commit b98259868b8362bb027636d8209fa7e583d9dff4 -Merge: 292570ad6 34ed2d834 -Author: Péter Szilágyi <peterke@gmail.com> -Date: Wed May 6 12:59:33 2020 +0300 - - Merge pull request #21032 from karalabe/skip-announce-goroutine-eth64 - - eth: skip transaction announcer goroutine on eth<65 - -commit 292570ad6cea36ae89fd024cfd7d5319fc68170e -Merge: 933acf338 8f8ff8d60 -Author: Péter Szilágyi <peterke@gmail.com> -Date: Wed May 6 12:58:51 2020 +0300 - - Merge pull request #21028 from karalabe/memfix-32bit-arch - - cmd/geth: handle memfixes on 32bit arch with large RAM - -commit 34ed2d834a7786e4ae3c24fbcea6cc236bc644f7 -Author: Péter Szilágyi <peterke@gmail.com> -Date: Wed May 6 12:47:27 2020 +0300 - - eth: skip transaction announcer goroutine on eth<65 - -commit 933acf3389d420a655b35a8dbf40536ebe058113 -Author: Marius van der Wijden <m.vanderwijden@live.de> -Date: Tue May 5 16:30:43 2020 +0200 - - account/abi: remove superfluous type checking (#21022) - - * accounts/abi: added getType func to Type struct - - * accounts/abi: fixed tuple unpack - - * accounts/abi: removed type.Type - - * accounts/abi: added comment - - * accounts/abi: removed unused types - - * accounts/abi: removed superfluous declarations - - * accounts/abi: typo - -commit 44a3b8c04cf18dc0a796f96d5972beb0e3cbe79b -Merge: a52511e69 451577299 -Author: Péter Szilágyi <peterke@gmail.com> -Date: Tue May 5 15:11:40 2020 +0300 - - Merge pull request #21026 from karalabe/disable-highmem-test - - tests: skip consensus test using 1GB RAM - -commit a52511e69295e3b81b0a6f5a391549764a234b55 -Author: Péter Szilágyi <peterke@gmail.com> -Date: Tue May 5 15:11:00 2020 +0300 - - build: raise test timeout back to 10 mins (#21027) - -commit 8f8ff8d6010954fe5dbd2ce36330fbf1b8451e4f -Author: Péter Szilágyi <peterke@gmail.com> -Date: Tue May 5 13:25:56 2020 +0300 - - cmd/geth: handle memfixes on 32bit arch with large RAM - -commit 4515772993db46e8e5e9480be579c75238c4f227 -Author: Péter Szilágyi <peterke@gmail.com> -Date: Tue May 5 12:27:09 2020 +0300 - - tests: skip consensus test using 1GB RAM - -commit c989bca173681f4462985cec2d30616aa0774edd -Author: rene <41963722+renaynay@users.noreply.github.com> -Date: Tue May 5 10:19:17 2020 +0200 - - cmd/utils: renames flags related to http-rpc server (#20935) - - * rpc flags related to starting http server renamed to http - - * old rpc flags aliased and still functional - - * pprof flags fixed - - * renames gpo related flags - - * linted - - * renamed rpc flags for consistency and clarity - - * added warn logs - - * added more warn logs for all deprecated flags for consistency - - * moves legacy flags to separate file, hides older flags under show-deprecated-flags command - - * legacy prefix and moved some more legacy flags to legacy file - - * fixed circular import - - * added docs - - * fixed imports lint error - - * added notes about when flags were deprecated - - * cmd/utils: group flags by deprecation date + reorder by date, - - * modified deprecated comments for consistency, added warn log for --rpc - - * making sure deprecated flags are still functional - - * show-deprecated-flags command cleaned up - - * fixed lint errors - - * corrected merge conflict - - * IsSet --> GlobalIsSet - - * uncategorized flags, if not deprecated, displayed under misc - - Co-authored-by: Martin Holst Swende <martin@swende.se> - -commit 587656619d281fe76824a392008ff87d1a0bbe3f -Merge: 5e45db761 da5914701 -Author: Péter Szilágyi <peterke@gmail.com> -Date: Mon May 4 17:10:17 2020 +0300 - - Merge pull request #21023 from karalabe/snapshot-verify-iterator-release - - core/state/snapshot: release iterator after verification - -commit da591470147689bb5978eaaff28468d19af61614 -Author: Péter Szilágyi <peterke@gmail.com> -Date: Mon May 4 15:14:08 2020 +0300 - - core/state/snapshot: release iterator after verification \ No newline at end of file + trie: fix TestBadRangeProof unit test (#21034) \ No newline at end of file