/hg/release/icedtea7-2.1: 3 new changesets

[andrew at icedtea.classpath.org]

changeset b8cb46df164a in /hg/release/icedtea7-2.1
details: http://icedtea.classpath.org/hg/release/icedtea7-2.1?cmd=changeset;node=b8cb46df164a
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 15 11:31:13 2012 +0000

	Removed tag icedtea-2.1


changeset 328ab29b4c9d in /hg/release/icedtea7-2.1
details: http://icedtea.classpath.org/hg/release/icedtea7-2.1?cmd=changeset;node=328ab29b4c9d
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 15 11:32:44 2012 +0000

	Bump update version to 03 (for u3) due to security fixes.

	2012-02-15 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: (JDK_UPDATE_VERSION): Set to 03 for
	u3.


changeset e98c78bd3a7b in /hg/release/icedtea7-2.1
details: http://icedtea.classpath.org/hg/release/icedtea7-2.1?cmd=changeset;node=e98c78bd3a7b
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 15 11:32:53 2012 +0000

	Added tag icedtea-2.1 for changeset 328ab29b4c9d


diffstat:

 .hgtags     |   4 ++++
 ChangeLog   |  11 ++++++++---
 Makefile.am |   2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diffs (59 lines):

diff -r f1eba3bfe520 -r e98c78bd3a7b .hgtags
--- a/.hgtags	Wed Feb 15 10:51:05 2012 +0000
+++ b/.hgtags	Wed Feb 15 11:32:53 2012 +0000
@@ -33,3 +33,7 @@
 e4c9d9bd4a99ee2993e6737a84ccb9792fa7c4d1 icedtea-2.0-branchpoint
 d35c742babc02eb874684ea7cb647ef5eda55c75 icedtea-2.1-branchpoint
 de4d9db187fae866aa2019ba29f2b926a74a1b71 icedtea-2.1
+de4d9db187fae866aa2019ba29f2b926a74a1b71 icedtea-2.1
+0000000000000000000000000000000000000000 icedtea-2.1
+0000000000000000000000000000000000000000 icedtea-2.1
+328ab29b4c9d64f8b0422eaf0c3dcebfb8fd8c30 icedtea-2.1
diff -r f1eba3bfe520 -r e98c78bd3a7b ChangeLog
--- a/ChangeLog	Wed Feb 15 10:51:05 2012 +0000
+++ b/ChangeLog	Wed Feb 15 11:32:53 2012 +0000
@@ -1,3 +1,8 @@
+2012-02-15  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(JDK_UPDATE_VERSION): Set to 03 for u3.
+
 2012-02-15  Andrew John Hughes  <ahughes at redhat.com>
 
 	* NEWS: Set release date for 2.1 and
@@ -51,20 +56,20 @@
 	to work with latest OpenJDK ALT_HOTSPOT_IMPORT_PATH functionality.
 	* patches/cacao/version.patch: Removed, replaced by upstream CACAO changeset 30edcde287d9.
 
-2012-10-08  Andrew John Hughes  <ahughes at redhat.com>
+2012-02-08  Andrew John Hughes  <ahughes at redhat.com>
 
 	(HOTSPOT_CHANGESET): Bump to fix HotSpot merge
 	issue.
 	(HOTSPOT_SHA256SUM): Likewise.
 
-2012-10-08  Andrew John Hughes  <ahughes at redhat.com>
+2012-02-08  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
 	Move JDK_UPDATE_VERSION and COMBINED_VERSION
 	to top of file with OPENJDK_VERSION.
 	(JDK_UPDATE_VERSION): Set to 02 for u2.
 
-2012-10-08  Andrew John Hughes  <ahughes at redhat.com>
+2012-02-08  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
 	(CORBA_CHANGESET): Updated.
diff -r f1eba3bfe520 -r e98c78bd3a7b Makefile.am
--- a/Makefile.am	Wed Feb 15 10:51:05 2012 +0000
+++ b/Makefile.am	Wed Feb 15 11:32:53 2012 +0000
@@ -1,7 +1,7 @@
 # Dependencies
 
 OPENJDK_VERSION = b147
-JDK_UPDATE_VERSION = 02
+JDK_UPDATE_VERSION = 03
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
 
 CORBA_CHANGESET = 5617f6c5cc94