changeset 53438:e0086f0b4e52

Merge
author robm
date Mon, 18 Feb 2019 07:45:57 -0800
parents d2cf708a52ae efc36b43b3f9
children 049140127bc8
files .hgtags make/autoconf/version-numbers
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Feb 18 11:17:31 2019 +0530
+++ b/.hgtags	Mon Feb 18 07:45:57 2019 -0800
@@ -536,5 +536,9 @@
 60ff8949381adea46f489f6bbecf9232a028e830 jdk-12.0.1+1
 c3fc07bf408084671904abac6b1873aebf7983c7 jdk-12.0.1+2
 d52a133717eef8e05abd6d12bb75d943607c517c jdk-12.0.1+3
+9a91d1dc777a633330e5d99f78123e46c3b2cdf2 jdk-12.0.1+4
+c9c530b917a3479a25c4b9eaca2c31a37e2e5206 jdk-12.0.1+5
+0c9a2cd825dc312270eb7b043baef59a289ad9ec jdk-12.0.1+6
+e4607e374223b6fc9e2883ee52ae4971c21e6757 jdk-12.0.1+7
 9a91d1dc777a633330e5d99f78123e46c3b2cdf2 jdk-12.0.2+0
 c09bdb9043f15463018d47411d38fa7495934d4d jdk-12.0.1+0
--- a/make/conf/jib-profiles.js	Mon Feb 18 11:17:31 2019 +0530
+++ b/make/conf/jib-profiles.js	Mon Feb 18 07:45:57 2019 -0800
@@ -1154,7 +1154,7 @@
         args = concat(args,
                       // This needs to be changed when we start building release candidates
                       // with-version-pre must be set to ea for 'ea' and empty for fcs build
-                      "--with-version-pre=ea",
+                      "--with-version-pre=",
                       "--without-version-opt");
     } else {
         args = concat(args, "--with-version-opt=" + common.build_id);