Mercurial > hg > release > icedtea7-2.2

changeset 2504:ea914bacafad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bump to fix HotSpot merge issue. 2012-10-08 Andrew John Hughes <ahughes@redhat.com> (HOTSPOT_CHANGESET): Bump to fix HotSpot merge issue. (HOTSPOT_SHA256SUM): Likewise.
author Andrew John Hughes <ahughes@redhat.com>
date Thu, 09 Feb 2012 00:17:25 +0000
parents ab2e1d6184e0
children ff55f6591be9
files ChangeLog Makefile.am
diffstat 2 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Feb 08 18:34:22 2012 +0000
+++ b/ChangeLog	Thu Feb 09 00:17:25 2012 +0000
@@ -1,3 +1,9 @@
+2012-10-08  Andrew John Hughes  <ahughes@redhat.com>
+
+	(HOTSPOT_CHANGESET): Bump to fix HotSpot merge
+	issue.
+	(HOTSPOT_SHA256SUM): Likewise.
+
 2012-10-08  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
--- a/Makefile.am	Wed Feb 08 18:34:22 2012 +0000
+++ b/Makefile.am	Thu Feb 09 00:17:25 2012 +0000
@@ -5,7 +5,7 @@
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
 
 CORBA_CHANGESET = 78cd4b4fcb75
-HOTSPOT_CHANGESET = 7bcec32b0c9a
+HOTSPOT_CHANGESET = c1378bce4f58
 JAXP_CHANGESET = 7300d2ab9fb2
 JAXWS_CHANGESET = d26ff33070cb
 JDK_CHANGESET = 6ba07a297b14
@@ -13,7 +13,7 @@
 OPENJDK_CHANGESET = a66b58021165
 
 CORBA_SHA256SUM = c25abc052d0e3041c558869ba88f80bf3ff051efbcd20e6c22b862fdd4c066d4
-HOTSPOT_SHA256SUM = dcd0fa5986cda4e691a8c4a3cfd81587248d51d4460b989c7ead0bb7a08f2674
+HOTSPOT_SHA256SUM = b5e763021c62bf0489b7147316e9015a05622fb398e4802275f39a2b9b01ac97
 JAXP_SHA256SUM = 0774d2acaa47052b8f529edae1ca868721a0164a956455958a6ea51550fa01e0
 JAXWS_SHA256SUM = 5f0a98280219fa8fe2926cfd4471fb0e98391b38a3c4b29743ad361832cea0e2
 JDK_SHA256SUM = db85a3ce380b6a3f1ed60178112bcb308b6f5a37eaeaedc4534acfd50275d87c