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

Merged
merged 94 commits into from
Apr 24, 2020
Merged

Merge master #18

merged 94 commits into from
Apr 24, 2020

Conversation

openjdk-bot
Copy link

@openjdk-bot openjdk-bot commented Apr 23, 2020

Hi all,

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

The following files contains merge conflicts:

  • src/hotspot/share/oops/instanceKlass.hpp
  • src/java.base/share/classes/java/lang/Class.java

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 sealed-types
$ git pull https://github.com/openjdk/amber sealed-types

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

# Merge the target branch
$ git merge sealed-types

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-40:40

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/18/head:pull/18
$ git checkout pull/18

iignatev and others added 30 commits April 14, 2020 12:50
Fixed the typos and format

Reviewed-by: egahlin, mseledtsov
Reviewed-by: mdoerr, gziemski
…iles

Co-authored-by: Eirik Bjørsnøs <eirbjo@gmail.com>
Reviewed-by: lancea, redestad
…eating MacroLogicV

Reviewed-by: kvn, sviswanathan, jbhateja
…coding non-byte primitives

Reviewed-by: kvn
… tier3

Added the test to jdk_tier3 via jdk_jfr_tier3

Reviewed-by: egahlin
…h sun.jvm.hotspot.types.WrongTypeException

Reviewed-by: amenkov, sspitsyn, iklam
…atible PSSParameterSpec for an RSASSA-PSS key

Reviewed-by: valeriep, hchao
Make option obsolete and removed supporting code.

Reviewed-by: tschatzl, stefank
…ative to VM

8242290: Pointless verification in get_package_entry_by_name

Reviewed-by: lfoltan, iklam, hseigel
…ble anonymous class

Preventing NullPointerException when a class has an erroneous supertype and does not have an implementation of the equals method.

Reviewed-by: darcy, vromero
Flow should handle invalid exits from class initializers gracefully

Reviewed-by: vromero
…ion not attributed

Fully attributing misplaced and/or duplicated super/this constructor invocations

Reviewed-by: mcimadamore
…eceives 204 response

The HTTP/2 Stream is updated to register a trivial data subscriber in case of 204 so that the END_STREAM is correctly processed.

Reviewed-by: chegar
shipilev and others added 12 commits April 23, 2020 13:48
Reviewed-by: stuefe, vtewari, redestad, lancea
…hes on macOS

Reviewed-by: eosterlund, clanger, mbaesken, azeller
….RequestEngine#setFlushInterval

Reviewed-by: egahlin
Revert definition of offset_of and reenable -Winvalid-offsetof.

Reviewed-by: erikj, ihse, dholmes
…ations into account

Reviewed-by: eosterlund, stefank
Moved fields around and some constant fields into ConstantPool

Reviewed-by: cjplummer, dlong, iklam
Reviewed-by: herrick, almatvee, erikj
@bridgekeeper
Copy link

bridgekeeper bot commented Apr 23, 2020

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

@openjdk openjdk bot added merge-conflict The pull request has a merge conflict with the target branch rfr Ready for review labels Apr 23, 2020
@openjdk
Copy link

openjdk bot commented Apr 24, 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 /solves command.

There are currently no new commits on the sealed-types 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 8e0e8e557c34b32cf980edf8e943bee73dcd8972.

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 Apr 24, 2020
@openjdk-bot
Copy link
Author

/integrate

@openjdk
Copy link

openjdk bot commented Apr 24, 2020

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

@openjdk openjdk bot added the sponsor Ready to sponsor label Apr 24, 2020
@vicente-romero-oracle
Copy link
Collaborator

/integrate

@openjdk
Copy link

openjdk bot commented Apr 24, 2020

@vicente-romero-oracle Only the author (@openjdk-bot) is allowed to issue the integrate command. As this PR is ready to be sponsored, and you are an eligible sponsor, did you mean to issue the /sponsor command?

@vicente-romero-oracle vicente-romero-oracle merged commit b66db1c into openjdk:sealed-types Apr 24, 2020
@vicente-romero-oracle
Copy link
Collaborator

/sponsor

@briangoetz briangoetz mentioned this pull request Oct 21, 2020
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
failed-auto-merge ready Ready to be integrated rfr Ready for review sponsor Ready to sponsor
Development

Successfully merging this pull request may close these issues.