jjiang [Wed, 17 Jan 2018 18:34:50 -0800] rev 48547
8194864: Outputs more details for PKCS11 tests if the NSS lib version cannot be determined
Summary: It outputs the lib content if the lib version cannot be parsed
Reviewed-by: xuelei
wetmore [Wed, 17 Jan 2018 18:26:05 -0800] rev 48546
8190229: Non-ASCII characters in java.security file after 8186093
Reviewed-by: weijun
bchristi [Wed, 17 Jan 2018 16:15:15 -0800] rev 48545
8194879: Runtime.Version parses string which does not conform to spec without throwing IAE
Reviewed-by: alanb, iris, rriggs
mchung [Wed, 17 Jan 2018 15:17:50 -0800] rev 48544
8194554: filterArguments runs multiple filters in the wrong order
Reviewed-by: psandoz, jrose
goetz [Tue, 16 Jan 2018 08:48:34 +0100] rev 48543
8189102: All tools should support -?, -h and --help
Reviewed-by: kvn, jjg, weijun, alanb, rfield, ksrini
martin [Thu, 11 Jan 2018 20:19:50 -0800] rev 48542
8194960: Add a test for trust manager and cacerts keystore sanity
Reviewed-by: weijun
dl [Tue, 16 Jan 2018 18:28:39 -0800] rev 48541
8193300: Miscellaneous changes imported from jsr166 CVS 2018-01
Reviewed-by: martin
dl [Tue, 16 Jan 2018 18:24:32 -0800] rev 48540
8191483: AbstractQueuedSynchronizer cancel/cancel race
Reviewed-by: martin
weijun [Wed, 17 Jan 2018 07:55:20 +0800] rev 48539
8195119: Fine-tune output text in keytool
Reviewed-by: mullan
lana [Tue, 16 Jan 2018 22:24:20 +0000] rev 48538
Merge