# HG changeset patch
# User rriggs
# Date 1430487944 14400
# Node ID c903c8e5624da7f1771a543aba962c51bc2d6ffd
# Parent  540c891d870fd76a6d0a8d12d2ae6853a2221727# Parent  332465740d9b6d2be11dc297772d601ee93d280e
Merge

diff -r 540c891d870f -r c903c8e5624d common/bin/compare_exceptions.sh.incl
--- a/common/bin/compare_exceptions.sh.incl	Thu Apr 30 09:57:58 2015 -0400
+++ b/common/bin/compare_exceptions.sh.incl	Fri May 01 09:45:44 2015 -0400
@@ -83,7 +83,6 @@
 ./bin/jcmd
 ./bin/jconsole
 ./bin/jdb
-./bin/jhat
 ./bin/jimage
 ./bin/jinfo
 ./bin/jjs
@@ -163,7 +162,6 @@
 ./bin/jcmd
 ./bin/jconsole
 ./bin/jdb
-./bin/jhat
 ./bin/jimage
 ./bin/jinfo
 ./bin/jjs
@@ -284,7 +282,6 @@
 ./bin/jcmd
 ./bin/jconsole
 ./bin/jdb
-./bin/jhat
 ./bin/jimage
 ./bin/jinfo
 ./bin/jjs
@@ -420,7 +417,6 @@
 ./bin/jcmd
 ./bin/jconsole
 ./bin/jdb
-./bin/jhat
 ./bin/jimage
 ./bin/jinfo
 ./bin/jjs
@@ -499,7 +495,6 @@
 ./bin/jcmd.exe
 ./bin/jconsole.exe
 ./bin/jdb.exe
-./bin/jhat.exe
 ./bin/jimage.exe
 ./bin/jinfo.exe
 ./bin/jjs.exe
@@ -579,7 +574,6 @@
 ./bin/jcmd
 ./bin/jconsole
 ./bin/jdb
-./bin/jhat
 ./bin/jimage
 ./bin/jinfo
 ./bin/jjs
diff -r 540c891d870f -r c903c8e5624d make/Images.gmk
--- a/make/Images.gmk	Thu Apr 30 09:57:58 2015 -0400
+++ b/make/Images.gmk	Fri May 01 09:45:44 2015 -0400
@@ -209,7 +209,6 @@
       jcmd.1 \
       jdb.1 \
       jdeps.1 \
-      jhat.1 \
       jinfo.1 \
       jmap.1 \
       jps.1 \
diff -r 540c891d870f -r c903c8e5624d make/jprt.properties
--- a/make/jprt.properties	Thu Apr 30 09:57:58 2015 -0400
+++ b/make/jprt.properties	Fri May 01 09:45:44 2015 -0400
@@ -444,7 +444,6 @@
 
 # Hotspot jtreg tests
 my.make.rule.test.targets.hotspot.reg=						\
-  ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_wbapitest},	\
   ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler_1},	\
   ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler_2},	\
   ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler_3},	\