Merge
authorduke
Wed, 05 Jul 2017 20:05:54 +0200
changeset 27304 03562d5f4f8b
parent 27303 97d38ac57757 (diff)
parent 27302 ff3103f12eda (current diff)
child 27309 bf2ff5decbe7
Merge
jdk/src/java.base/share/conf/calendars.properties
jdk/src/java.base/share/conf/hijrah-config-umalqura.properties
jdk/src/java.desktop/unix/classes/META-INF/services/javax.print.PrintServiceLookup
jdk/src/java.desktop/unix/classes/META-INF/services/javax.print.StreamPrintServiceFactory
jdk/src/java.desktop/unix/classes/sun/print/UnixPrintServiceLookup.java
jdk/src/java.desktop/windows/classes/META-INF/services/javax.print.PrintServiceLookup
jdk/src/java.desktop/windows/classes/META-INF/services/javax.print.StreamPrintServiceFactory
jdk/src/java.desktop/windows/classes/sun/print/Win32PrintServiceLookup.java
jdk/test/java/sql/TEST.properties
jdk/test/java/sql/test/sql/BatchUpdateExceptionTests.java
jdk/test/java/sql/test/sql/DataTruncationTests.java
jdk/test/java/sql/test/sql/DateTests.java
jdk/test/java/sql/test/sql/DriverManagerPermissionsTests.java
jdk/test/java/sql/test/sql/DriverManagerTests.java
jdk/test/java/sql/test/sql/SQLClientInfoExceptionTests.java
jdk/test/java/sql/test/sql/SQLDataExceptionTests.java
jdk/test/java/sql/test/sql/SQLExceptionTests.java
jdk/test/java/sql/test/sql/SQLFeatureNotSupportedExceptionTests.java
jdk/test/java/sql/test/sql/SQLIntegrityConstraintViolationExceptionTests.java
jdk/test/java/sql/test/sql/SQLInvalidAuthorizationSpecExceptionTests.java
jdk/test/java/sql/test/sql/SQLNonTransientConnectionExceptionTests.java
jdk/test/java/sql/test/sql/SQLNonTransientExceptionTests.java
jdk/test/java/sql/test/sql/SQLRecoverableExceptionTests.java
jdk/test/java/sql/test/sql/SQLSyntaxErrorExceptionTests.java
jdk/test/java/sql/test/sql/SQLTimeoutExceptionTests.java
jdk/test/java/sql/test/sql/SQLTransactionRollbackExceptionTests.java
jdk/test/java/sql/test/sql/SQLTransientConnectionExceptionTests.java
jdk/test/java/sql/test/sql/SQLTransientExceptionTests.java
jdk/test/java/sql/test/sql/SQLWarningTests.java
jdk/test/java/sql/test/sql/TimeTests.java
jdk/test/java/sql/test/sql/TimestampTests.java
jdk/test/java/sql/util/BaseTest.java
jdk/test/java/sql/util/DriverActionImpl.java
jdk/test/java/sql/util/SerializedBatchUpdateException.java
jdk/test/java/sql/util/StubBlob.java
jdk/test/java/sql/util/StubConnection.java
jdk/test/java/sql/util/StubDriver.java
jdk/test/java/sql/util/StubDriverDA.java
jdk/test/java/sql/util/TestPolicy.java
jdk/test/javax/sql/testng/util/BaseTest.java
jdk/test/javax/sql/testng/util/TestPolicy.java
--- a/corba/.hgtags	Wed Jul 05 20:05:51 2017 +0200
+++ b/corba/.hgtags	Wed Jul 05 20:05:54 2017 +0200
@@ -279,3 +279,4 @@
 24a0bad5910f775bb4002d1dacf8b3af87c63cd8 jdk9-b34
 9bc2dbd3dfb8c9fa88e00056b8b93a81ee6d306e jdk9-b35
 ffd90c81d4ef9d94d880fc852e2fc482ecd9b374 jdk9-b36
+7e9add74ad50841fb39dae75db56374aefa1de4c jdk9-b37