# HG changeset patch
# User mgerdin
# Date 1408373382 0
# Node ID 6676e3082fe8f7a71af3199ba0551e7925079d30
# Parent  7a33b179d6c522a891127bbf88bb5bbdd37f9968# Parent  1f15bfaa9c5215fce596a4c60a5633e6750779bb
Merge

diff -r 7a33b179d6c5 -r 6676e3082fe8 hotspot/test/sanity/WhiteBox.java
--- a/hotspot/test/sanity/WhiteBox.java	Mon Aug 18 15:41:57 2014 +0200
+++ b/hotspot/test/sanity/WhiteBox.java	Mon Aug 18 14:49:42 2014 +0000
@@ -29,7 +29,6 @@
  * @library /testlibrary
  * @compile WhiteBox.java
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI sun.hotspot.WhiteBox
  * @clean sun.hotspot.WhiteBox
  */