[threeten-dev] hg: threeten/threeten/jdk: 4 new changesets

[roger.riggs at oracle.com]

Changeset: 6c1a3df77a3c
Author:    rriggs
Date:      2013-05-02 08:18 -0400
URL:       http://hg.openjdk.java.net/threeten/threeten/jdk/rev/6c1a3df77a3c

Remove extraneous printf

! test/java/time/tck/java/time/chrono/TCKChronologySerialization.java

Changeset: dd79b91f8b12
Author:    rriggs
Date:      2013-05-02 08:18 -0400
URL:       http://hg.openjdk.java.net/threeten/threeten/jdk/rev/dd79b91f8b12

#304 Update HijrahChronology to use CLDR v23 type-subtype syntax
  Remove logic and tests for variants and use the type name as a single string

! src/share/classes/java/time/chrono/Chronology.java
! test/java/time/tck/java/time/chrono/TCKChronology.java
! test/java/time/test/java/time/chrono/TestExampleCode.java

Changeset: d6d55d80f2ed
Author:    rriggs
Date:      2013-05-02 13:48 -0400
URL:       http://hg.openjdk.java.net/threeten/threeten/jdk/rev/d6d55d80f2ed

Merge

- make/com/sun/servicetag/Makefile
! makefiles/CopyFiles.gmk
- src/share/classes/com/sun/servicetag/BrowserSupport.java
- src/share/classes/com/sun/servicetag/Installer.java
- src/share/classes/com/sun/servicetag/LinuxSystemEnvironment.java
- src/share/classes/com/sun/servicetag/RegistrationData.java
- src/share/classes/com/sun/servicetag/RegistrationDocument.java
- src/share/classes/com/sun/servicetag/Registry.java
- src/share/classes/com/sun/servicetag/ServiceTag.java
- src/share/classes/com/sun/servicetag/SolarisServiceTag.java
- src/share/classes/com/sun/servicetag/SolarisSystemEnvironment.java
- src/share/classes/com/sun/servicetag/SunConnection.java
- src/share/classes/com/sun/servicetag/SystemEnvironment.java
- src/share/classes/com/sun/servicetag/UnauthorizedAccessException.java
- src/share/classes/com/sun/servicetag/Util.java
- src/share/classes/com/sun/servicetag/WindowsSystemEnvironment.java
- src/share/classes/com/sun/servicetag/package.html
- src/share/classes/com/sun/servicetag/resources/Putback-Notes.txt
- src/share/classes/com/sun/servicetag/resources/javase_5_swordfish.properties
- src/share/classes/com/sun/servicetag/resources/javase_6_swordfish.properties
- src/share/classes/com/sun/servicetag/resources/javase_7_swordfish.properties
- src/share/classes/com/sun/servicetag/resources/javase_servicetag.properties
- src/share/classes/com/sun/servicetag/resources/jdk_header.png
- src/share/classes/com/sun/servicetag/resources/product_registration.xsd
- src/share/classes/com/sun/servicetag/resources/register.html
- src/share/classes/com/sun/servicetag/resources/register_ja.html
- src/share/classes/com/sun/servicetag/resources/register_zh_CN.html
! src/share/classes/java/time/chrono/Chronology.java
- src/share/classes/sun/java2d/cmm/lcms/META-INF/services/sun.java2d.cmm.PCMM
- src/share/native/java/lang/ResourceBundle.c
- test/com/sun/servicetag/DeleteServiceTag.java
- test/com/sun/servicetag/DuplicateNotFound.java
- test/com/sun/servicetag/FindServiceTags.java
- test/com/sun/servicetag/InstanceUrnCheck.java
- test/com/sun/servicetag/InvalidRegistrationData.java
- test/com/sun/servicetag/InvalidServiceTag.java
- test/com/sun/servicetag/JavaServiceTagTest.java
- test/com/sun/servicetag/JavaServiceTagTest1.java
- test/com/sun/servicetag/NewRegistrationData.java
- test/com/sun/servicetag/SvcTagClient.java
- test/com/sun/servicetag/SystemRegistryTest.java
- test/com/sun/servicetag/TestLoadFromXML.java
- test/com/sun/servicetag/UpdateServiceTagTest.java
- test/com/sun/servicetag/Util.java
- test/com/sun/servicetag/ValidRegistrationData.java
- test/com/sun/servicetag/environ.properties
- test/com/sun/servicetag/missing-environ-field.xml
- test/com/sun/servicetag/newer-registry-version.xml
- test/com/sun/servicetag/registration.xml
- test/com/sun/servicetag/servicetag1.properties
- test/com/sun/servicetag/servicetag2.properties
- test/com/sun/servicetag/servicetag3.properties
- test/com/sun/servicetag/servicetag4.properties
- test/com/sun/servicetag/servicetag5.properties
! test/java/time/tck/java/time/chrono/TCKChronology.java
! test/java/time/tck/java/time/chrono/TCKChronologySerialization.java
! test/java/time/test/java/time/chrono/TestExampleCode.java
- test/java/util/ComparatorsTest.java
- test/sun/tools/jstat/gcPermCapacityOutput1.awk
- test/sun/tools/jstat/jstatGcPermCapacityOutput1.sh

Changeset: 7ac11f5a80ee
Author:    rriggs
Date:      2013-05-02 13:59 -0400
URL:       http://hg.openjdk.java.net/threeten/threeten/jdk/rev/7ac11f5a80ee

Merge