changeset 8254:fd5901f4b951

Merge
author asaha
date Thu, 09 Mar 2017 09:52:31 -0800
parents 15af9b4ac654 829ea9b92cda
children 0cee0db0180b 264db5526c9d
files .hgtags
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Feb 24 09:14:18 2017 -0800
+++ b/.hgtags	Thu Mar 09 09:52:31 2017 -0800
@@ -954,4 +954,6 @@
 6e4cfbc7534f83902692132efb61683528c04a59 jdk8u131-b06
 5b3cb4fbdbc7bdeb7c78a8703c3084ce068f6691 jdk8u131-b07
 db221c0a423e776bec5c3198d11d3f26827bd786 jdk8u131-b08
+56e71d16083904ceddfdd1d66312582a42781646 jdk8u131-b09
+1da23ae49386608550596502d90a381ee6c1dfaa jdk8u131-b10
 692bc6b674dcab72453de08ee9da0856a7e41c0f jdk8u141-b00
--- a/src/os/windows/vm/os_windows.cpp	Fri Feb 24 09:14:18 2017 -0800
+++ b/src/os/windows/vm/os_windows.cpp	Thu Mar 09 09:52:31 2017 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1747,8 +1747,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;