Merge

.hgtags

@@ -453,10 +453,24 @@ cc6c74b164dfd0636d9dba8f9865baa18a6f2338 jdk8u60-b20
 63c9cedeeb9d0de656969f3deed7ddafae11754a jdk8u60-b21
 e9f82302d5fdef8a0976640e09363895e9dcde3c jdk8u60-b22
 c4b37246b92736adf5f40c785aabb67a7d227245 jdk8u60-b23
+d433f5fd8910bee1f2c295b65cf03977034fe0ea jdk8u60-b24
+c8cfbe57bcd5042d2fef42dcef14d73dd4bdc416 jdk8u60-b25
+0d6a8a9b26a37678b420ff540b5a622c3f4fd44c jdk8u60-b26
+afbc08ea922bf6e5e14d2eea24a2f94f37627ea7 jdk8u60-b27
 286b9a885fcc6245fdf2b20697473ec3b35f2538 jdk8u65-b00
 80a796d0db958f49a4b0713818227eda8e5efbb9 jdk8u65-b01
 77d48e6d111faec236c8678997ae4311151cfee4 jdk8u65-b02
 3e3a22acc5be4eb4b860b4b4c0080473f5605988 jdk8u65-b03
 2a5f20c49ad1de765a8c26aab1e13aee8e53b5c6 jdk8u65-b04
 fe1c420a8982e58f6d49c50b729732d93f9682dd jdk8u65-b05
+3ee40ba7525d6d5ee201a475b967ca2e5c3c9ab3 jdk8u65-b06
+bd2ad7acb217391747dae8263c090483af454313 jdk8u65-b07
+d215cd281678e4b89a4155755cd6e03e37b7e9b1 jdk8u65-b08
+e9de15763a5a3cef64ef1d4bc40a018d4d572325 jdk8u65-b09
+e9f82302d5fdef8a0976640e09363895e9dcde3c jdk8u66-b00
+64d7bd4e98150447916f210e3bfd6875a4c2728a jdk8u66-b01
+d8210091911b14930192abd3138ee37c281fb632 jdk8u66-b02
+b3773a2b6bf64c1df4db2b94f822b5ffb17eacc9 jdk8u66-b07
+6751966e4e943dba0f5640505530789dc4d184bf jdk8u66-b08
+8b7c7d297b7a59b1fb8678750795b18e3818f46c jdk8u66-b09
 9a2747ef337bdee71bc8225dea77eb403cca1179 jdk8u71-b00

make/profile-rtjar-includes.txt

 #
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, 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
@@ -207,6 +207,8 @@ FULL_JRE_RTJAR_INCLUDE_PACKAGES := \
     javax/xml/bind \
     javax/xml/soap \
     javax/xml/ws \
+    jdk/internal/instrumentation \
+    jdk/management/resource \
     org/omg \
     sun/applet \
     sun/audio \

src/bsd/doc/man/java.1

@@ -8,7 +8,7 @@
 .\"
 .\" This code is distributed in the hope that it will be useful, but WITHOUT
 .\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-.\" FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+.\" FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 .\" version 2 for more details (a copy is included in the LICENSE file that
 .\" accompanied this code).
 .\"