hg: build-infra/jdk8/jdk: 2 new changesets

[erik.joelsson at oracle.com]

Changeset: c5c1b97de71a
Author:    ykantser
Date:      2012-02-29 10:16 +0100
URL:       http://hg.openjdk.java.net/build-infra/jdk8/jdk/rev/c5c1b97de71a

Fixed the error that crept in during the merge - double copying of print resources.

! makefiles/CopyIntoClasses.gmk

Changeset: 4581d6e57360
Author:    erikj
Date:      2012-02-29 11:23 +0100
URL:       http://hg.openjdk.java.net/build-infra/jdk8/jdk/rev/4581d6e57360

Merge

- src/linux/doc/man/apt.1
- src/linux/doc/man/ja/apt.1
- src/share/classes/com/sun/management/DiagnosticCommandArgumentInfo.java
- src/share/classes/com/sun/management/DiagnosticCommandInfo.java
- src/share/classes/sun/nio/ch/SctpMessageInfoImpl.java
- src/share/classes/sun/nio/ch/SctpStdSocketOption.java
- src/solaris/classes/sun/nio/ch/SctpAssocChange.java
- src/solaris/classes/sun/nio/ch/SctpAssociationImpl.java
- src/solaris/classes/sun/nio/ch/SctpChannelImpl.java
- src/solaris/classes/sun/nio/ch/SctpMultiChannelImpl.java
- src/solaris/classes/sun/nio/ch/SctpNet.java
- src/solaris/classes/sun/nio/ch/SctpNotification.java
- src/solaris/classes/sun/nio/ch/SctpPeerAddrChange.java
- src/solaris/classes/sun/nio/ch/SctpResultContainer.java
- src/solaris/classes/sun/nio/ch/SctpSendFailed.java
- src/solaris/classes/sun/nio/ch/SctpServerChannelImpl.java
- src/solaris/classes/sun/nio/ch/SctpShutdown.java
- src/solaris/doc/sun/man/man1/apt.1
- src/solaris/doc/sun/man/man1/ja/apt.1
- src/solaris/native/sun/nio/ch/Sctp.h
- src/solaris/native/sun/nio/ch/SctpChannelImpl.c
- src/solaris/native/sun/nio/ch/SctpNet.c
- src/solaris/native/sun/nio/ch/SctpServerChannelImpl.c
- src/windows/classes/sun/nio/ch/SctpChannelImpl.java
- src/windows/classes/sun/nio/ch/SctpMultiChannelImpl.java
- src/windows/classes/sun/nio/ch/SctpServerChannelImpl.java
- test/com/sun/management/HotSpotDiagnosticMXBean/ExecuteDiagnosticCommand.java
- test/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticCommandInfo.java
- test/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticCommands.java
- test/tools/launcher/ChangeDataModel.sh
- test/tools/launcher/CreatePlatformFile.java
- test/tools/launcher/SomeException.java
- test/tools/launcher/UnicodeCleanup.java
- test/tools/launcher/UnicodeTest.sh
- test/tools/launcher/deleteI18n.sh
- test/tools/launcher/i18nTest.sh
- test/tools/launcher/unresolvedExceptions.sh