Merge

Fri, 31 Oct 2014 20:18:41 -0700

author
lana
date
Fri, 31 Oct 2014 20:18:41 -0700
changeset 7280
c1d0d673b1ba
parent 7278
b251d9b90799
parent 7279
9f35f614847d
child 7315
86307d477907

Merge

     1.1 --- a/src/share/vm/runtime/arguments.cpp	Wed Oct 29 10:50:30 2014 -0700
     1.2 +++ b/src/share/vm/runtime/arguments.cpp	Fri Oct 31 20:18:41 2014 -0700
     1.3 @@ -66,7 +66,7 @@
     1.4  #endif // INCLUDE_ALL_GCS
     1.5  
     1.6  // Note: This is a special bug reporting site for the JVM
     1.7 -#define DEFAULT_VENDOR_URL_BUG "http://bugreport.sun.com/bugreport/crash.jsp"
     1.8 +#define DEFAULT_VENDOR_URL_BUG "http://bugreport.java.com/bugreport/crash.jsp"
     1.9  #define DEFAULT_JAVA_LAUNCHER  "generic"
    1.10  
    1.11  // Disable options not supported in this release, with a warning if they

mercurial