changeset 1706:bbc1966c6af9 icedtea-3.0.0pre09

Merge jdk8u72-b15
author andrew
date Fri, 05 Feb 2016 17:41:50 +0000
parents da2254579723 (diff) 769b21d1b85c (current diff)
children 8bc8232cf9fb
files .hgtags src/jdk/nashorn/internal/codegen/AstSerializer.java src/jdk/nashorn/internal/objects/BoundScriptFunctionImpl.java src/jdk/nashorn/internal/objects/PrototypeObject.java src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java src/jdk/nashorn/internal/runtime/arrays/InvalidArrayIndexException.java test/src/jdk/nashorn/api/scripting/JSONCompatibleTest.java
diffstat 2 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Dec 22 12:17:25 2015 -0800
+++ b/.hgtags	Fri Feb 05 17:41:50 2016 +0000
@@ -283,6 +283,7 @@
 7e89db817ed094766a039762a8061c3a600c7284 jdk8u20-b07
 2282c86cb1a954efd2fc5b7f22c173be19087c55 jdk8u20-b08
 41f588adeb7a397d395233f00bd3402d0989934a jdk8u20-b09
+fdcdffd5b5b1eb7d442096433d17466f023207f1 icedtea-3.0.0pre01
 fdcdffd5b5b1eb7d442096433d17466f023207f1 jdk8u20-b10
 c116e9229e096ffe841f2b4f79067378288d0d1d jdk8u20-b11
 c720454d2435be052fd941a789ece9468d1e8f74 jdk8u20-b12
@@ -296,6 +297,7 @@
 ed3439dca4a73a2dd4a284f3457f0af216a3eb55 jdk8u20-b20
 f2925491b61b22ac42f8c30ee9c6723ffa401a4c jdk8u20-b21
 5332595fe7ba2a1fc5564cc2689f378b04a56eb4 jdk8u20-b22
+2a866ca13bc68da2a70f200002797b2bea432c68 icedtea-3.0.0pre02
 ad36f9454ce38d78be39fc819902e1223765ee5e jdk8u20-b23
 d3da140e179343011017669a6dbfcc52b0e56f52 jdk8u20-b24
 d3da140e179343011017669a6dbfcc52b0e56f52 jdk8u20-b25
@@ -363,6 +365,9 @@
 653739706172ae94e999731a3a9f10f8ce11ffca jdk8u40-b18
 6ec61d2494283fbaca6df227f1a5b45487dc1ca7 jdk8u40-b19
 4d240320929f7b2247eeb97e43efe2370b70582e jdk8u40-b20
+d8fc6574c0b2f294df84cc0b188b9140537e896b icedtea-3.0.0pre03
+bb36d4894aa49666805a0d08607a80cac3a0fffb icedtea-3.0.0pre04
+f78a539468973c9afb83cd38849fb13427d58ea2 icedtea-3.0.0pre05
 dbb663a9d9aa2807ef501c7d20f29415816a1973 jdk8u40-b21
 f9f70a0f60f48fbb95275b6c1110cedf740c6177 jdk8u40-b22
 6ca090832d30fd0e46214ccc00816490ad75a8ab jdk8u40-b23
@@ -439,6 +444,9 @@
 7475a2bd3c012f7dfd0532a344eb7efca56ac6e6 jdk8u60-b21
 9ed906919b5d92067edcdd966a3f413fca0f70ab jdk8u60-b22
 23165e806566f01cdc56421ea82c7e74a6fd85d5 jdk8u60-b23
+6f6d12f78ab05aa9ece89aeec09177ae088f33aa icedtea-3.0.0pre06
+fd478ce27023b3a4a7a9b64e65ce670c2b047542 icedtea-3.0.0pre07
+7babac6e7ecf625dc1f8f2c961c09ea9822ae90f icedtea-3.0.0pre08
 68107693248469f7b4fdcc35c53e4206a0d55087 jdk8u60-b24
 371f3f83f773ec97491d994bbcce834f0a2cca74 jdk8u60-b25
 58791cd01bc9aa973d8845ce63403b90d357b5ac jdk8u60-b26
--- a/.jcheck/conf	Tue Dec 22 12:17:25 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk8
-bugids=dup