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 #183

Closed
wants to merge 55 commits into from
Closed

Merge master #183

wants to merge 55 commits into from

Conversation

@openjdk-bot
Copy link
Contributor

@openjdk-bot openjdk-bot commented May 27, 2020

Hi all,

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

Over 40 files contains merge conflicts.

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/panama-foreign repository.

# Ensure target branch is up to date
$ git checkout foreign-memaccess
$ git pull https://github.com/openjdk/panama-foreign foreign-memaccess

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

# Merge the target branch
$ git merge foreign-memaccess

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/panama-foreign openjdk-bot-38:38

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
  • Change must be properly reviewed

Download

$ git fetch https://git.openjdk.java.net/panama-foreign pull/183/head:pull/183
$ git checkout pull/183

cl4es and others added 30 commits May 22, 2020
Reviewed-by: dfuchs, pconcannon
…ue 'READ_ONLY'

Reviewed-by: dfuchs, pconcannon
…h NullPointerException

Reviewed-by: sspitsyn, dtitov
…ith getHeaderField/Key for FileURLConnection, FtpURLConnection

Reviewed-by: dfuchs
…signature algorithms by keytool on root CA

Reviewed-by: weijun
…ending JNI Exception Check during class loading

Fix the -Xcheck:jni asserts

Reviewed-by: dholmes, cjplummer
Reviewed-by: iklam, coleenp, ngasson, aph
…th -XX:+Verbose -Xlog:methodhandles

Fix crash due to a missing ResourceMark when logging methodhandles with Verbose.

Reviewed-by: dcubed, dholmes, coleenp
Upstream latest changes of the Foreign-Memory Access API

Co-authored-by: Jorn Vernee <jorn.vernee@oracle.com>
Co-authored-by: Mandy Chung <mandy.chung@oracle.com>
Co-authored-by: Paul Sandoz <paul.sandoz@oracle.com>
Co-authored-by: Peter Levart <peter.levart@gmail.com>
Reviewed-by: chegar, psandoz
Reviewed-by: jlaskey, psandoz, forax, mchung
…es to ResourceBundles

Changed the Logger catalog cache to use WeakReference<ResourceBundle>

Reviewed-by: lancea, mchung, naoto
Reviewed-by: jlaskey, redestad
…om oop class

Remove volatile qualifications in oop and derived classes; use Atomic for access.

Reviewed-by: dholmes, coleenp
…ansion_amount

Reviewed-by: kbarrett, sjohanss
Kim Barrett and others added 10 commits May 27, 2020
Ensure trailing bits in last copied word are cleared.

Reviewed-by: tschatzl, sjohanss
…n specs

Remove duplications from the Instrumentation, JDI and JDWP redefinition specs

Reviewed-by: dholmes, cjplummer
… log to debug level

Reviewed-by: dholmes, coleenp, tschatzl
…tion detected. memory leak in CodeCache!"

Assert is too strong.

Reviewed-by: roland
… Tiered Level set externally

Fixed to not to run the testcase with TieredStopAtLevel set

Reviewed-by: thartmann
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented May 27, 2020

👋 Welcome back duke! A progress list of the required criteria for merging this PR into foreign-memaccess will be added to the body of your pull request.

@mlbridge
Copy link

@mlbridge mlbridge bot commented May 27, 2020

@mlbridge
Copy link

@mlbridge mlbridge bot commented May 27, 2020

Mailing list message from Maurizio Cimadamore on panama-dev:

I will take care of this

Maurizio

On 27/05/2020 13:27, J.Duke wrote:

@openjdk
Copy link

@openjdk openjdk bot commented May 28, 2020

@openjdk-bot This change now passes all automated pre-integration checks, type /integrate in a new comment to proceed. 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 foreign-memaccess 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 cd397502f19f72fa8a926f4508d3913c8ace9059.

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 and removed merge-conflict labels May 28, 2020
@openjdk-bot
Copy link
Contributor Author

@openjdk-bot openjdk-bot commented May 28, 2020

/integrate

@openjdk openjdk bot added the sponsor label May 28, 2020
@openjdk
Copy link

@openjdk openjdk bot commented May 28, 2020

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

@mcimadamore
Copy link
Collaborator

@mcimadamore mcimadamore commented May 28, 2020

/sponsor

@openjdk openjdk bot closed this May 28, 2020
@openjdk
Copy link

@openjdk openjdk bot commented May 28, 2020

@mcimadamore @openjdk-bot
Pushed as commit dedc7d8.

@openjdk openjdk bot removed the rfr label May 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment