diff --git a/.hgtags b/.hgtags index 1faaf4e3d33fe3205c0a0be56945343dbdca2536..709813a8ed2261128f432cc81640051adab698d7 100644 --- a/.hgtags +++ b/.hgtags @@ -958,3 +958,5 @@ c965fc1aa840a0903709ad69aa0e2100330ccd84 jdk8u131-b05 6e4cfbc7534f83902692132efb61683528c04a59 jdk8u131-b06 5b3cb4fbdbc7bdeb7c78a8703c3084ce068f6691 jdk8u131-b07 db221c0a423e776bec5c3198d11d3f26827bd786 jdk8u131-b08 +56e71d16083904ceddfdd1d66312582a42781646 jdk8u131-b09 +1da23ae49386608550596502d90a381ee6c1dfaa jdk8u131-b10 diff --git a/src/os/windows/vm/os_windows.cpp b/src/os/windows/vm/os_windows.cpp index e329c9fd6cd65e8e0d7c24b9885960b4206a33f5..44d89a2885e24b2d850aebed19c57a8f628ba826 100644 --- a/src/os/windows/vm/os_windows.cpp +++ b/src/os/windows/vm/os_windows.cpp @@ -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 @@ void os::win32::print_windows_version(outputStream* st) { 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;