# HG changeset patch
# User trims
# Date 1297905980 28800
# Node ID 02368ad6c63f7437d37b6088831491088a5f6cfa
# Parent  e9aa2ca89ad6c53420623d579765f9706ec523d7# Parent  f7702f8c0e257c2e7dfa1dee2a7001b3fb995bc9
Merge

diff -r f7702f8c0e25 -r 02368ad6c63f src/share/vm/runtime/globals.hpp
--- a/src/share/vm/runtime/globals.hpp	Mon Feb 14 22:21:18 2011 -0500
+++ b/src/share/vm/runtime/globals.hpp	Wed Feb 16 17:26:20 2011 -0800
@@ -3658,10 +3658,10 @@
   manageable(bool, PrintConcurrentLocks, false,                             \
           "Print java.util.concurrent locks in thread dump")                \
                                                                             \
-  diagnostic(bool, TransmitErrorReport, false,                              \
+  product(bool, TransmitErrorReport, false,                                 \
           "Enable error report transmission on erroneous termination")      \
                                                                             \
-  diagnostic(ccstr, ErrorReportServer, NULL,                                \
+  product(ccstr, ErrorReportServer, NULL,                                   \
           "Override built-in error report server address")                  \
                                                                             \
   /* Shared spaces */                                                       \