hg: jdk8/tl/jdk: 2 new changesets

[vincent.x.ryan at oracle.com]

Changeset: a9840446d677
Author:    vinnie
Date:      2012-03-05 14:13 +0000
URL:       http://hg.openjdk.java.net/jdk8/tl/jdk/rev/a9840446d677

7151109: backout CR 6988842
Reviewed-by: mullan

! make/sun/security/Makefile
! src/share/classes/sun/security/pkcs11/Config.java
! src/share/classes/sun/security/pkcs11/SunPKCS11.java
! test/ProblemList.txt
! test/sun/security/pkcs11/PKCS11Test.java
- test/sun/security/pkcs11/nss/lib/README
- test/sun/security/pkcs11/nss/lib/windows-amd64/freebl3.chk
- test/sun/security/pkcs11/nss/lib/windows-amd64/freebl3.dll
- test/sun/security/pkcs11/nss/lib/windows-amd64/libnspr4.dll
- test/sun/security/pkcs11/nss/lib/windows-amd64/libnspr4.lib
- test/sun/security/pkcs11/nss/lib/windows-amd64/libplc4.dll
- test/sun/security/pkcs11/nss/lib/windows-amd64/libplc4.lib
- test/sun/security/pkcs11/nss/lib/windows-amd64/libplds4.dll
- test/sun/security/pkcs11/nss/lib/windows-amd64/libplds4.lib
- test/sun/security/pkcs11/nss/lib/windows-amd64/nss3.dll
- test/sun/security/pkcs11/nss/lib/windows-amd64/nss3.lib
- test/sun/security/pkcs11/nss/lib/windows-amd64/nssckbi.dll
- test/sun/security/pkcs11/nss/lib/windows-amd64/nssdbm3.chk
- test/sun/security/pkcs11/nss/lib/windows-amd64/nssdbm3.dll
- test/sun/security/pkcs11/nss/lib/windows-amd64/nssutil3.dll
- test/sun/security/pkcs11/nss/lib/windows-amd64/nssutil3.lib
- test/sun/security/pkcs11/nss/lib/windows-amd64/softokn3.chk
- test/sun/security/pkcs11/nss/lib/windows-amd64/softokn3.dll
- test/sun/security/pkcs11/nss/lib/windows-amd64/sqlite3.dll
- test/sun/security/pkcs11/nss/lib/windows-amd64/ssl3.dll
- test/sun/security/pkcs11/nss/lib/windows-amd64/ssl3.lib
- test/sun/security/pkcs11/nss/lib/windows-i586/freebl3.chk
- test/sun/security/pkcs11/nss/lib/windows-i586/freebl3.dll
! test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.dll
- test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.lib
! test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.dll
- test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.lib
! test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.dll
- test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.lib
! test/sun/security/pkcs11/nss/lib/windows-i586/nss3.dll
- test/sun/security/pkcs11/nss/lib/windows-i586/nss3.lib
! test/sun/security/pkcs11/nss/lib/windows-i586/nssckbi.dll
- test/sun/security/pkcs11/nss/lib/windows-i586/nssdbm3.chk
- test/sun/security/pkcs11/nss/lib/windows-i586/nssdbm3.dll
- test/sun/security/pkcs11/nss/lib/windows-i586/nssutil3.dll
- test/sun/security/pkcs11/nss/lib/windows-i586/nssutil3.lib
- test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.chk
! test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.dll
- test/sun/security/pkcs11/nss/lib/windows-i586/sqlite3.dll
- test/sun/security/pkcs11/nss/lib/windows-i586/ssl3.dll
- test/sun/security/pkcs11/nss/lib/windows-i586/ssl3.lib
! test/sun/security/pkcs11/nss/p11-nss.txt
! test/sun/security/tools/keytool/autotest.sh

Changeset: 4785a6d4ae15
Author:    vinnie
Date:      2012-03-05 14:15 +0000
URL:       http://hg.openjdk.java.net/jdk8/tl/jdk/rev/4785a6d4ae15

Merge