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

8264047: Duplicate global variable 'jvm' in libjavajpeg and libawt #103

Closed
wants to merge 1 commit into from

Conversation

@jerboaa
Copy link
Contributor

@jerboaa jerboaa commented Apr 9, 2021


Progress

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

Issue

  • JDK-8264047: Duplicate global variable 'jvm' in libjavajpeg and libawt

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk16u pull/103/head:pull/103
$ git checkout pull/103

Update a local copy of the PR:
$ git checkout pull/103
$ git pull https://git.openjdk.java.net/jdk16u pull/103/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 103

View PR using the GUI difftool:
$ git pr show -t 103

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk16u/pull/103.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Apr 9, 2021

👋 Welcome back sgehwolf! 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.

@openjdk openjdk bot changed the title Backport eb6330e4f0366878e7ec8a606ddc717622cbdaea 8264047: Duplicate global variable 'jvm' in libjavajpeg and libawt Apr 9, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 9, 2021

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

@openjdk
Copy link

@openjdk openjdk bot commented Apr 9, 2021

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

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

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

8264047: Duplicate global variable 'jvm' in libjavajpeg and libawt

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Apr 9, 2021

Webrevs

@jerboaa
Copy link
Contributor Author

@jerboaa jerboaa commented Apr 13, 2021

/integrate

@openjdk openjdk bot closed this Apr 13, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Apr 13, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 13, 2021

@jerboaa Since your change was applied there has been 1 commit pushed to the master branch:

  • 4f5421e: 8262110: DST starts from incorrect time in 2038

Your commit was automatically rebased without conflicts.

Pushed as commit 2826d30.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
1 participant