Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8234347: "Turkey" meta time zone does not generate composed localized names #40

Closed
wants to merge 1 commit into from

Conversation

@yan-too
Copy link
Collaborator

@yan-too yan-too commented Dec 1, 2020

This fix should resolve both JDK-8236548 and JDK-8234347. It does require CSR (JDK-8257501) and will be pushed after the approval of it. The patch applies clean with only extra context changes in copyright dates. The change is in both jdk15 and jdk11.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issues

  • JDK-8234347: "Turkey" meta time zone does not generate composed localized names * JDK-8236548: Localized time zone name inconsistency between English and other locales

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk13u-dev pull/40/head:pull/40
$ git checkout pull/40

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Dec 1, 2020

👋 Welcome back yan! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

Loading

@openjdk openjdk bot changed the title Backport 5c3a01591c5c945926636fdc9f164d60b5b4f29e 8234347: "Turkey" meta time zone does not generate composed localized names Dec 1, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Dec 1, 2020

This backport pull request has now been updated with issues from the original commit.

Loading

@mlbridge
Copy link

@mlbridge mlbridge bot commented Dec 1, 2020

Webrevs

Loading

bae
bae approved these changes Dec 7, 2020
Copy link
Collaborator

@bae bae left a comment

Looks fine.

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Dec 7, 2020

@yan-too This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8234347: "Turkey" meta time zone does not generate composed localized names
8236548: Localized time zone name inconsistency between English and other locales

Reviewed-by: bae

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 12 new commits pushed to the master branch:

  • 6456cad: 8240197: Cannot start JVM when $JAVA_HOME includes CJK characters
  • a48eb78: 8250984: Memory Docker tests fail on some Linux kernels w/o cgroupv1 swap limit capabilities
  • e22699c: 8231968: getCurrentThreadAllocatedBytes default implementation s/b getThreadAllocatedBytes
  • 4881f8e: 8246648: issue with OperatingSystemImpl getFreeSwapSpaceSize in docker after 8242480
  • 93f5fc0: 8231209: [REDO] JDK-8207266 ThreadMXBean::getThreadAllocatedBytes() can be quicker for self thread
  • 021a35e: 8242480: Negative value may be returned by getFreeSwapSpaceSize() in the docker
  • 18bd8e2: 8250627: Use -XX:+/-UseContainerSupport for enabling/disabling Java container metrics
  • 28cc6c2: 8254982: (tz) Upgrade time-zone data to tzdata2020c
  • b31ff27: 8254177: (tz) Upgrade time-zone data to tzdata2020b
  • b452c82: 8233228: Disable weak named curves by default in TLS, CertPath, and Signed JAR
  • ... and 2 more: https://git.openjdk.java.net/jdk13u-dev/compare/dabaf4e9475ee21af08bc615e6a9be95df0c161f...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

Loading

@openjdk openjdk bot added the ready label Dec 7, 2020
@yan-too
Copy link
Collaborator Author

@yan-too yan-too commented Dec 7, 2020

/integrate

Loading

@openjdk openjdk bot closed this Dec 7, 2020
@openjdk openjdk bot added integrated and removed ready rfr labels Dec 7, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Dec 7, 2020

@yan-too Since your change was applied there have been 12 commits pushed to the master branch:

  • 6456cad: 8240197: Cannot start JVM when $JAVA_HOME includes CJK characters
  • a48eb78: 8250984: Memory Docker tests fail on some Linux kernels w/o cgroupv1 swap limit capabilities
  • e22699c: 8231968: getCurrentThreadAllocatedBytes default implementation s/b getThreadAllocatedBytes
  • 4881f8e: 8246648: issue with OperatingSystemImpl getFreeSwapSpaceSize in docker after 8242480
  • 93f5fc0: 8231209: [REDO] JDK-8207266 ThreadMXBean::getThreadAllocatedBytes() can be quicker for self thread
  • 021a35e: 8242480: Negative value may be returned by getFreeSwapSpaceSize() in the docker
  • 18bd8e2: 8250627: Use -XX:+/-UseContainerSupport for enabling/disabling Java container metrics
  • 28cc6c2: 8254982: (tz) Upgrade time-zone data to tzdata2020c
  • b31ff27: 8254177: (tz) Upgrade time-zone data to tzdata2020b
  • b452c82: 8233228: Disable weak named curves by default in TLS, CertPath, and Signed JAR
  • ... and 2 more: https://git.openjdk.java.net/jdk13u-dev/compare/dabaf4e9475ee21af08bc615e6a9be95df0c161f...master

Your commit was automatically rebased without conflicts.

Pushed as commit c4c63b9.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Loading

@yan-too yan-too deleted the bpscr8236548 branch Dec 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants