# HG changeset patch
# User kevinw
# Date 1304602394 14400
# Node ID 52df0980eb50a2b7538cbbc26437629527b1893b
# Parent  f49c31acee881a04e978f926fb958c34f539443a# Parent  277d0f6ca64d7d2b89d768354b1b8959549e9959
Merge

diff -r f49c31acee88 -r 52df0980eb50 src/share/vm/runtime/globals.hpp
--- a/src/share/vm/runtime/globals.hpp	Wed May 04 23:10:58 2011 -0400
+++ b/src/share/vm/runtime/globals.hpp	Thu May 05 09:33:14 2011 -0400
@@ -2882,7 +2882,7 @@
           "Max. no. of lines in the stack trace for Java exceptions "       \
           "(0 means all)")                                                  \
                                                                             \
-  NOT_EMBEDDED(develop(intx, GuaranteedSafepointInterval, 1000,             \
+  NOT_EMBEDDED(diagnostic(intx, GuaranteedSafepointInterval, 1000,          \
           "Guarantee a safepoint (at least) every so many milliseconds "    \
           "(0 means none)"))                                                \
                                                                             \