7038807: [CCJK] OK button on message dialog of JOptionpane is not translated Reviewed-by: yhuang

7042475: [ja,zh_CN] extra mnemonic key in jconsole Reviewed-by: yhuang

7028447: security-related resources Chinese translation errors Reviewed-by: weijun

7042323: [sv, de, es, it] Print dialog has duplicate mnemonic key Reviewed-by: yhuang

7043580: integrate man page translation drop 2 into jdk7 Reviewed-by: yhuang

7021691: Most log level words are not translated in java logging Reviewed-by: yhuang

Merge

Merge

Merge

Merge

Merge

7028071: Add two attributes to the OperatingSystemMXBean to provide CPU Load info Summary: Add getProcessCpuLoad() and getSystemCpuLoad() to the OperatingSystemMXBean Reviewed-by: acorn, dholmes, mchung

Merge

Merge

6738532: Error in Elliptic Curve NamedCurve determination. (related to PKCS11) Reviewed-by: valeriep

Merge

7035172: Reintroduce LICENSE file in JDK/JRE bundle Reviewed-by: billyh

Merge

Merge

Merge

7041044: InetAddress.getByName(String,InetAddress) added in error Reviewed-by: alanb

7040151: SPNEGO GSS code does not parse tokens in accordance to RFC 2478 Reviewed-by: valeriep

7041136: Use Objects.equals in JDK platform classes Reviewed-by: alanb, mduigou

7040220: java/char_encodin Optimize UTF-8 charset for String.getBytes()/new String(byte[]) Summary: implement sun.nio.cs.ArrayEn/Decoer in utf8 Reviewed-by: alanb

6553182: Need to modify javadoc doclet for GPL Reviewed-by: jjg

Merge

6569621: Problem with java/classes_net Reviewed-by: chegar

7036522: j.u.r.Pattern documentation errors Summary: updated the Perl related information Reviewed-by: alanb

7040916: DynamicKeyTab test fails on Windows Reviewed-by: xuelei

Merge

7040572: Fix broken java/nio/charset/StandardCharset/Standard.java and add more tests. Reviewed-by: alanb

7036252: sunpkcs11-solaris.cfg needs a review Summary: Updated the disabled mechanisms section since Solaris bug 6306708 has been fixed. Reviewed-by: mullan

7039809: Remove @ConstructorProperties annotation from java.io.File class Reviewed-by: alanb, malenkov

7040150: Indexing Error in CachedRowSetImpl.removeCurrentRow Reviewed-by: smarks

7039066: j.u.rgex does not match TR18 RL1.4 Simple Word Boundaries and RL1.2 Properties Summary: updated the regex Unicode property support Reviewed-by: alanb

7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard Summary: updated j.l.c.lsLowerCase/isUpperCase Reviewed-by: okutsu

7038843: IIOP serialization fails with NullPointerException when serializing Throwable Reviewed-by: dholmes, mchung

6578658: Request for raw RSA (NONEwithRSA) Signature support in SunMSCAPI Reviewed-by: wetmore

Merge

7040381: Add StandardCharset.java to FILES_java.gmk Reviewed-by: alanb

7037081: Remove com.sun.tracing from NON_CORE_PKGS Reviewed-by: ohair, jjg, jmasa

7038565: address Findbugs issue in BatchUpdateException Reviewed-by: alanb, forax

7037201: regression: invalid signed jar file not detected Reviewed-by: mullan

Merge

4884238: Adds java.nio.charset.StandardCharset to provide static final constants for the standard charsets. Reviewed-by: alanb, sherman, darcy

Merge

6753664: Support SHA256 (and higher) in SunMSCAPI Reviewed-by: mullan

7039186: (ch) EPoll based asynchronous I/O implementation should be portable to linux-arm and linux-ppc Reviewed-by: dholmes

6950929: Failures on Solaris sparc 64bit sun/security/krb5/auto/BadKdc4.java (and linux?) Reviewed-by: xuelei

7039369: Limit range of strictfp in FloatingDecimal Summary: Additional reviews by sergey.kuksenko@oracle.com Reviewed-by: alanb

7029383: Refresh of non-client demos Reviewed-by: mchung, ohair

6931562: Support SunMSCAPI Security Provider in Windows 64-bit releases of JVM Reviewed-by: mullan

Merge

Merge

6519228: JDWP Spec: need references at capability canRequestMonitorEvents for JDWP 1.6 Monitor* events Summary: Add descriptions in event type table Reviewed-by: ohair, jjh, acorn, dcubed

7038885: Improved bulk operation disclaimers for concurrent collections Reviewed-by: chegar