Mercurial > hg > icedtea8

changeset 2997:21f7845bd41d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix merge error. Upstream changes: - Fix merge error ChangeLog: 2021-05-03 Andrew John Hughes <gnu_andrew@member.fsf.org> Fix merge error. * hotspot.map.in: Bump to include merge fix.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Tue, 04 May 2021 04:03:36 +0100
parents e8852134b368
children 1c52437839eb
files ChangeLog hotspot.map.in
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon May 03 12:51:28 2021 +0100
+++ b/ChangeLog	Tue May 04 04:03:36 2021 +0100
@@ -1,3 +1,9 @@
+2021-05-03  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	Fix merge error.
+	* hotspot.map.in: Bump to include merge
+	fix.
+
 2021-02-21  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	PR3835: Populate unique SystemTap suffix
--- a/hotspot.map.in	Mon May 03 12:51:28 2021 +0100
+++ b/hotspot.map.in	Tue May 04 04:03:36 2021 +0100
@@ -1,4 +1,4 @@
 # version type(drop/hg) url changeset sha256sum
-default drop https://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ dd646a857cc3 c4c263c42934344caa9ea49b60c9fa90ae304ecfb10a567927995371d208d5e7
+default drop https://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ 723b59ed1afe 80cb9d85fbd2b08ff741d2d810fe4516ef05ca2a5c690bdeacfb8a9cea6b9d1d
 shenandoah drop https://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ 9e58eb00ef60 d81606795abe5721d54aef6413677845a24c5b2202414a095bd04f1fba945fca
 aarch32 drop https://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ fa977f20ebe0 f852d17ae09047f2432604422e9e58ec6473eceabe8b217320928e3ee2e58d4c