Merge
authorctornqvi
Thu, 25 Feb 2016 01:55:45 +0000
changeset 36362 3113b1b523c4
parent 36360 b8f3e1f238ff (current diff)
parent 36361 00aaa003d2e7 (diff)
child 36363 394562fd49a3
Merge
hotspot/src/os/windows/vm/os_windows.cpp
--- a/hotspot/src/os/windows/vm/os_windows.cpp	Thu Feb 25 01:23:10 2016 +0100
+++ b/hotspot/src/os/windows/vm/os_windows.cpp	Thu Feb 25 01:55:45 2016 +0000
@@ -1710,8 +1710,7 @@
     if (is_workstation) {
       st->print("10");
     } else {
-      // The server version name of Windows 10 is not known at this time
-      st->print("%d.%d", major_version, minor_version);
+      st->print("Server 2016");
     }
     break;