Merge

Thu, 09 Mar 2017 09:41:22 -0800

author
asaha
date
Thu, 09 Mar 2017 09:41:22 -0800
changeset 8932
48a4fb4af0b7
parent 8931
6d84bb241c89
parent 8756
829ea9b92cda
child 8933
f00fbe2842d1
child 8939
a6c90d8e1900

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Fri Feb 24 09:04:04 2017 -0800
     1.2 +++ b/.hgtags	Thu Mar 09 09:41:22 2017 -0800
     1.3 @@ -958,3 +958,5 @@
     1.4  6e4cfbc7534f83902692132efb61683528c04a59 jdk8u131-b06
     1.5  5b3cb4fbdbc7bdeb7c78a8703c3084ce068f6691 jdk8u131-b07
     1.6  db221c0a423e776bec5c3198d11d3f26827bd786 jdk8u131-b08
     1.7 +56e71d16083904ceddfdd1d66312582a42781646 jdk8u131-b09
     1.8 +1da23ae49386608550596502d90a381ee6c1dfaa jdk8u131-b10
     2.1 --- a/src/os/windows/vm/os_windows.cpp	Fri Feb 24 09:04:04 2017 -0800
     2.2 +++ b/src/os/windows/vm/os_windows.cpp	Thu Mar 09 09:41:22 2017 -0800
     2.3 @@ -1,5 +1,5 @@
     2.4  /*
     2.5 - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
     2.6 + * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
     2.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.8   *
     2.9   * This code is free software; you can redistribute it and/or modify it
    2.10 @@ -1747,8 +1747,7 @@
    2.11      if (is_workstation) {
    2.12        st->print("10");
    2.13      } else {
    2.14 -      // The server version name of Windows 10 is not known at this time
    2.15 -      st->print("%d.%d", major_version, minor_version);
    2.16 +      st->print("Server 2016");
    2.17      }
    2.18      break;
    2.19  

mercurial