Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorduke
Wed, 05 Jul 2017 17:40:40 +0200
changeset 9061 045806757105
parent 9060 0319b53ef05f (diff)
parent 9057 193e5eef1b18 (current diff)
child 9065 0d012e044dd6
Merge
jdk/src/share/classes/java/nio/BufferPoolMXBean.java file | annotate | diff | comparison | revisions
jdk/src/share/classes/java/util/logging/PlatformLoggingMXBean.java file | annotate | diff | comparison | revisions
jdk/src/windows/native/java/net/NetworkInterface_win9x.c file | annotate | diff | comparison | revisions
jdk/test/java/nio/BufferPoolMXBean/Basic.java file | annotate | diff | comparison | revisions
jdk/test/java/util/logging/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java file | annotate | diff | comparison | revisions 
--- a/jaxp/.hgtags	Wed Jul 05 17:40:36 2017 +0200
+++ b/jaxp/.hgtags	Wed Jul 05 17:40:40 2017 +0200
@@ -111,3 +111,4 @@
 d56b326ae0544fc16c3e0d0285876f3c82054db2 jdk7-b134
 4aa9916693dc1078580c1865e6f2584046851e5a jdk7-b135
 1759daa85d33800bd578853f9531f9de73f70fc7 jdk7-b136
+1d87f7460cde7f8f30af668490f82b52b879bfd8 jdk7-b137
--- a/jaxp/build-defs.xml	Wed Jul 05 17:40:36 2017 +0200
+++ b/jaxp/build-defs.xml	Wed Jul 05 17:40:40 2017 +0200
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
- Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2009, 2010, 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
--- a/jaxp/build-drop-template.xml	Wed Jul 05 17:40:36 2017 +0200
+++ b/jaxp/build-drop-template.xml	Wed Jul 05 17:40:40 2017 +0200
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
- Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2009, 2010, 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
--- a/jaxp/build.xml	Wed Jul 05 17:40:36 2017 +0200
+++ b/jaxp/build.xml	Wed Jul 05 17:40:40 2017 +0200
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
- Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2009, 2010, 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
--- a/jaxp/jaxp.properties	Wed Jul 05 17:40:36 2017 +0200
+++ b/jaxp/jaxp.properties	Wed Jul 05 17:40:40 2017 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2011, 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
--- a/jaxp/make/Makefile	Wed Jul 05 17:40:36 2017 +0200
+++ b/jaxp/make/Makefile	Wed Jul 05 17:40:40 2017 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2011, 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
jdk-sandbox