prepare for merging

erigontech · Feb 27, 2020 · 70d7274 · 70d7274
1 parent 3e944cb
commit 70d7274
Show file tree

Hide file tree

Showing 2 changed files with 558 additions and 1 deletion.
diff --git a/UPGRADE_INFO.md b/UPGRADE_INFO.md
@@ -1,4 +1,16 @@
-# 2019-01-29 merge
+# Notes
+
+`git log v1.9.9...v1.9.10 > to-merge.txt`
+
+# 2020-02-21 merge
+
+commit 6a62fe399b68ab9e3625ef5e7900394f389adc3a (tag: v1.9.11, upstream/release/1.9)
+Author: Péter Szilágyi <peterke@gmail.com>
+Date:   Tue Feb 18 13:26:00 2020 +0200
+
+    params: release Geth v1.9.11 stable
+
+# 2020-01-29 merge
 
 commit ba49ad79065d6037d78fe66e508b67cac5ff7b59
 Author: Péter Szilágyi <peterke@gmail.com>