hg: jdk10/sandbox/jdk: 2 new changesets

[chris.hegarty at oracle.com]

Changeset: 965d4dde0086
Author:    naoto
Date:      2017-08-28 10:16 -0700
URL:       http://hg.openjdk.java.net/jdk10/sandbox/jdk/rev/965d4dde0086

8171049: Era.getDisplayName doesn't work with non-IsoChronology
Reviewed-by: rriggs

! src/java.base/share/classes/java/time/chrono/HijrahEra.java
! src/java.base/share/classes/java/time/chrono/JapaneseEra.java
! src/java.base/share/classes/java/time/chrono/MinguoEra.java
! src/java.base/share/classes/java/time/chrono/ThaiBuddhistEra.java
+ test/java/time/test/java/time/chrono/TestEraDisplayName.java

Changeset: a03402163220
Author:    rriggs
Date:      2017-08-28 13:21 -0400
URL:       http://hg.openjdk.java.net/jdk10/sandbox/jdk/rev/a03402163220

8186539: [testlibrary] TestSocketFactory should allow triggers before match/replace
Reviewed-by: smarks

! test/java/rmi/testlibrary/TestSocketFactory.java