# HG changeset patch
# User ctornqvi
# Date 1428679125 0
# Node ID c901e751e6814d05961840620dd64a3836bab745
# Parent  000cc9f42b61254823c70024fafff5987eda5043# Parent  1b49e7ab091e6da96639443f54ad8333f282aec9
Merge

diff -r 000cc9f42b61 -r c901e751e681 hotspot/test/runtime/NMT/JcmdDetailDiff.java
--- a/hotspot/test/runtime/NMT/JcmdDetailDiff.java	Fri Apr 10 05:22:56 2015 -0700
+++ b/hotspot/test/runtime/NMT/JcmdDetailDiff.java	Fri Apr 10 15:18:45 2015 +0000
@@ -28,7 +28,6 @@
  * @library /testlibrary /../../test/lib
  * @modules java.base/sun.misc
  *          java.management
- * @ignore
  * @build JcmdDetailDiff
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail JcmdDetailDiff