valeriep [Wed, 22 Dec 2010 19:19:32 -0800] rev 7812
6924489: sun.security.pkcs11.wrapper.PKCS11Exception: CKR_OPERATION_NOT_INITIALIZED
Summary: Reset cipher state to un-initialized wherever necessary.
Reviewed-by: weijun
dcubed [Thu, 23 Dec 2010 23:10:36 -0800] rev 7811
7005984: 3/3 Incorrect values of S0C and S0CMX appear with -gcnewcapacity in jstat
Summary: Swap S0C and S0CMX column values.
Reviewed-by: ohair, dholmes, poonam
ksrini [Thu, 23 Dec 2010 13:51:30 -0800] rev 7810
7002386: (launcher) fix XshowSettings
Reviewed-by: darcy, mchung, naoto
lana [Wed, 22 Dec 2010 23:12:17 -0800] rev 7809
Merge
valeriep [Wed, 22 Dec 2010 18:30:34 -0800] rev 7808
6581254: pkcs11 provider fails to parse configuration file contains windows short path
Summary: Modified configuration parsing code to support "~".
Reviewed-by: weijun
xuelei [Wed, 22 Dec 2010 06:28:46 -0800] rev 7807
6996365: Evaluate the priorities of cipher suites
Reviewed-by: wetmore