Merge
authorduke
Wed, 05 Jul 2017 18:20:49 +0200
changeset 13534 6a9ae2520d02
parent 13533 49f23700884c (current diff)
parent 13511 b4f6c05ae88a (diff)
child 13617 022cf02d77ee
Merge
--- a/.hgtags-top-repo	Fri Aug 31 16:17:41 2012 -0700
+++ b/.hgtags-top-repo	Wed Jul 05 18:20:49 2017 +0200
@@ -175,3 +175,4 @@
 57c0aee7309050b9d6cfcbd202dc704e9260b377 jdk8-b51
 8d24def5ceb3b8f2e857f2e18b2804fc59eecf8d jdk8-b52
 febd7ff5280067ca482faaeb9418ae88764c1a35 jdk8-b53
+c1a277c6022affbc6855bdfb039511e73fbe2395 jdk8-b54
--- a/make/scripts/hgforest.sh	Fri Aug 31 16:17:41 2012 -0700
+++ b/make/scripts/hgforest.sh	Wed Jul 05 18:20:49 2017 +0200
@@ -58,7 +58,7 @@
     fi
   done
   if [ "${pull_extra_base}" != "" ] ; then
-    subrepos_extra="jdk/src/closed jdk/make/closed jdk/test/closed hotspot/src/closed hotspot/test/closed deploy install sponsors pubs"
+    subrepos_extra="jdk/src/closed jdk/make/closed jdk/test/closed hotspot/make/closed hotspot/src/closed hotspot/test/closed deploy install sponsors pubs"
     pull_default_tail=`echo ${pull_default} | sed -e 's@^.*://[^/]*/\(.*\)@\1@'`
     pull_extra="${pull_extra_base}/${pull_default_tail}"
     for i in ${subrepos_extra} ; do