changeset 838:05829b187e4b

Merge
author lana
date Thu, 27 Jul 2017 02:17:04 +0000
parents f112f294a89e 4c07d366c2e1
children 6859ffbe2c51
files .hgtags
diffstat 3 files changed, 20 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Jul 20 21:12:22 2017 +0000
+++ b/.hgtags	Thu Jul 27 02:17:04 2017 +0000
@@ -399,9 +399,11 @@
 c48b4d4768b1c2b8fe5d1a844ca13732e5dfbe2a jdk-9+151
 6f8fb1cf7e5f61c40dcc3654f9a623c505f6de1f jdk-9+152
 7a532a9a227137155b905341d4b99939db51220e jdk-9+153
+34af95c7dbff74f3448fcdb7d745524e8a1cc88a jdk-10+0
 34af95c7dbff74f3448fcdb7d745524e8a1cc88a jdk-9+154
 9b9918656c97724fd89c04a8547043bbd37f5935 jdk-9+155
 7c829eba781409b4fe15392639289af1553dcf63 jdk-9+156
+6afc1d9b8c41457cc8ebe2e1a27b8fd6d887c1fb jdk-10+1
 b7e70e1e0154e1d2c69f814e03a8800ef8634fe0 jdk-9+157
 e53b322357382209fb553b9a1541ccfd12cbcb6c jdk-9+158
 0ea34706c7fa5cd71accd493eb4f54262e4a5f4e jdk-9+159
@@ -412,16 +414,31 @@
 1a52de2da827459e866fd736f9e9c62eb2ecd6bb jdk-9+164
 a987401bac0d528475e57732c9d5d93f4405804c jdk-9+165
 b1f30c27367bd286fa4eb8a767335e917a5b5b82 jdk-9+166
+06b9f0de66d3a17a10af380c950619c63b62d4cd jdk-10+2
+2e2c78f1713b2c6b760b870946d2b4341a1522e3 jdk-10+3
+ac7e572a6a6ba5bbd7e6aa94a289f88cc86256a4 jdk-10+4
+879aad463c21065254918629e6dfd7d7bf98adb2 jdk-10+5
+85e15cdc75aaaea8a1bb00563af7889869d3e602 jdk-10+6
 1c610f1b4097c64cdd722a7fb59f5a4d9cc15ca9 jdk-9+167
 2746716dcc5a8c28ccf41df0c8fb620b1a1e7098 jdk-9+168
 912cf69806d518c5af7fba30b340c4cb5458dd22 jdk-9+169
 e75d3abe579a7b39b762fc0a1a337c49eb072d82 jdk-9+170
+b0efae7df1dfa14926058baebaf999e4268c955c jdk-10+7
+e705867d9989d00e4357f66f18b302c95e13b5e7 jdk-10+8
+2fe03e35bed54238bcaeeb298b011df240e3711d jdk-10+9
 139e7c786ee4885efe53eb650b72c7b5a2d3b964 jdk-9+171
+3ccd9f37faa601866db5edb827363e797f5a2493 jdk-10+10
 8c615099f3e3ca137325be34bf566b767d9e3c64 jdk-9+172
+2d22d6732a73e615b9e13d6bc93bf026db3bc231 jdk-10+11
 2bd967aa452c1e0e87a6173bef6fbb96ef1c521b jdk-9+173
 c2296642010f1b215ac35da89e92c3ce44104e32 jdk-9+174
+712a3a657654079514590d37a0f4894d43541d5c jdk-10+12
 a5d361b9d1f7f78a675f3baef0d1fd32deee9ea2 jdk-9+175
+46a14aad004aa0b980d5f4ff7810d894fd5a36ae jdk-10+13
+bddeaa49ffd55567ad232548c38aa270e1a1420a jdk-10+14
 ea819b6009d33a72e6672bab6c101d51db0cfb4c jdk-9+176
 b44a721aee3d3b2537754e559fe9ecccadea548b jdk-9+177
+6d17fd0a5133a0dd916c77a9a24ae7f0ca402876 jdk-10+15
+bc8289ce1ed3ed5fff62152ed46da3be0b60b7c3 jdk-10+16
 d0190aaf1816081d9b2e0577b65b793804896d1e jdk-9+178
 56ac1831ac5924b5092a53a85d6fc68749501fb8 jdk-9+179
--- a/.jcheck/conf	Thu Jul 20 21:12:22 2017 +0000
+++ b/.jcheck/conf	Thu Jul 27 02:17:04 2017 +0000
@@ -1,1 +1,2 @@
-project=jdk9
+project=jdk10
+bugids=dup
--- a/src/java.activation/share/classes/javax/activation/CommandInfo.java	Thu Jul 20 21:12:22 2017 +0000
+++ b/src/java.activation/share/classes/javax/activation/CommandInfo.java	Thu Jul 27 02:17:04 2017 +0000
@@ -112,7 +112,7 @@
      * this method will check if it implements the
      * java.io.Externalizable interface. If it does, the bean's
      * readExternal method will be called if an InputStream
-     * can be acquired from the DataHandler.<p>
+     * can be acquired from the DataHandler.
      *
      * @param dh        The DataHandler that describes the data to be
      *                  passed to the command.