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

Merge master #38

Closed
wants to merge 57 commits into from
Closed

Merge master #38

wants to merge 57 commits into from

Conversation

openjdk-bot
Copy link

@openjdk-bot openjdk-bot commented Sep 10, 2020

Hi all,

this is an automatically generated pull request to notify you that there are 56 commits from the branch masterthat can not be merged into the branch records-2:

The following file contains merge conflicts:

  • .jcheck/conf

All Committers in this project have access to my personal fork and can therefore help resolve these merge conflicts (you may want to coordinate who should do this).
The following paragraphs will give an example on how to solve these merge conflicts and push the resulting merge commit to this pull request.
The below commands should be run in a local clone of your personal fork of the openjdk/amber repository.

# Ensure target branch is up to date
$ git checkout records-2
$ git pull https://github.com/openjdk/amber records-2

# Fetch and checkout the branch for this pull request
$ git fetch https://github.com/openjdk-bot/amber +60:openjdk-bot-60
$ git checkout openjdk-bot-60

# Merge the target branch
$ git merge records-2

When you have resolved the conflicts resulting from the git merge command above, run the following commands to create a merge commit:

$ git add paths/to/files/with/conflicts
$ git commit -m 'Merge master'

When you have created the merge commit, run the following command to push the merge commit to this pull request:

$ git push https://github.com/openjdk-bot/amber openjdk-bot-60:60

Note: if you are using SSH to push commits to GitHub, then change the URL in the above git push command accordingly.

Thanks,
J. Duke


Progress

  • Change must not contain extraneous whitespace

Download

$ git fetch https://git.openjdk.java.net/amber pull/38/head:pull/38
$ git checkout pull/38

Ningsheng Jian and others added 30 commits September 2, 2020 09:45
Co-authored-by: Joshua Zhu <joshua.zhu@arm.com>
Co-authored-by: Yang Zhang <yang.zhang@arm.com>
Reviewed-by: adinn, pli, ihse, vlivanov, eosterlund
…er/HugeCapacity.java tests shouldn't be @Ignore-d

Remove @ignore since @requires os.maxMemory is enough to ensure tests will not be executed if memory requirements are not satisfied

Reviewed-by: coffeys
Cleanup code for jlink classes generation, move parsing file work to java.lang.invoke and add a new API in interface JavaLangInvokeAccess to generate holder classes, remove old APIs. The new API is used both by JLI and CDS.

Reviewed-by: mchung, sundar
Reviewed-by: dcubed, dholmes, pchilanomate, rehn, sspitsyn
Some CPUs (like ARM32) does not support unaligned memory accesses. To avoid JVM crashes tests that perform such accesses should be skipped on corresponding platforms.

Reviewed-by: iignatyev, clanger
… modules

Co-authored-by: Galder Zamarreno <galder@redhat.com>
Reviewed-by: mcimadamore
Zero VM is broken due to 'block_if_requested' is not a member of 'SafepointMechanism'.

Reviewed-by: dholmes
…rnel configurations

Reviewed-by: stefank, eosterlund, pliden
8252816: JvmtiEnvThreadState::clear_to_frame_pop() is not used

Reviewed-by: ysuenaga, dholmes
@bridgekeeper
Copy link

bridgekeeper bot commented Sep 10, 2020

👋 Welcome back duke! A progress list of the required criteria for merging this PR into records-2 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 added merge-conflict The pull request has a merge conflict with the target branch rfr Ready for review labels Sep 10, 2020
@mlbridge
Copy link

mlbridge bot commented Sep 10, 2020

Webrevs

@openjdk
Copy link

openjdk bot commented Sep 11, 2020

@openjdk-bot This change now passes all automated pre-integration checks. In addition to the automated checks, the change must also fulfill all project specific requirements

After integration, the commit message will be:

Merge master
  • If you would like to add a summary, use the /summary command.
  • To credit additional contributors, use the /contributor command.
  • To add additional solved issues, use the /issue command.

There are currently no new commits on the records-2 branch since the last update of the source branch of this PR. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you would like to avoid potential automatic rebasing, specify the current head hash when integrating, like this: /integrate ceef8d1fde943d4ea9bef38449928e826eaf9658.

As you do not have Committer status in this project, an existing Committer must agree to sponsor your change.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added ready Ready to be integrated and removed merge-conflict The pull request has a merge conflict with the target branch labels Sep 11, 2020
@openjdk-bot
Copy link
Author

/integrate

@openjdk openjdk bot added the sponsor Ready to sponsor label Sep 11, 2020
@openjdk
Copy link

openjdk bot commented Sep 11, 2020

@openjdk-bot
Your change (at version e34b80b) is now ready to be sponsored by a Committer.

@lahodaj
Copy link
Collaborator

lahodaj commented Sep 11, 2020

/sponsor

@openjdk openjdk bot closed this Sep 11, 2020
@openjdk openjdk bot added integrated Pull request has been integrated and removed sponsor Ready to sponsor ready Ready to be integrated rfr Ready for review labels Sep 11, 2020
@openjdk
Copy link

openjdk bot commented Sep 11, 2020

@lahodaj @openjdk-bot Pushed as commit af76f74.

💡 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
Labels
failed-auto-merge integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.