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

JDK-8255032: Conflict between recent pushes breaks the build #752

Conversation

@jonathan-gibbons
Copy link
Contributor

@jonathan-gibbons jonathan-gibbons commented Oct 19, 2020

The patch resolves a bad merge between two recent changes.

The DocletEnvironment docEnv parameter no longer needs to be passed around.


Progress

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

Testing

Linux x64 Windows x64 macOS x64
Build (2/5 running) (2/2 running) (2/2 running)

Issue

  • JDK-8255032: Conflict between recent pushes breaks the build

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/752/head:pull/752
$ git checkout pull/752

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Oct 19, 2020

👋 Welcome back jjg! 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
Copy link

@openjdk openjdk bot commented Oct 19, 2020

@jonathan-gibbons The following label will be automatically applied to this pull request:

  • javadoc

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the javadoc label Oct 19, 2020
@jonathan-gibbons jonathan-gibbons changed the title Remove obsolete parameter JDK-8255032: Conflict between recent pushes breaks the build Oct 19, 2020
@openjdk openjdk bot added the rfr label Oct 19, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented Oct 19, 2020

Webrevs

@cl4es
cl4es approved these changes Oct 19, 2020
Copy link
Contributor

@vicente-romero-oracle vicente-romero-oracle left a comment

looks good

@jonathan-gibbons
Copy link
Contributor Author

@jonathan-gibbons jonathan-gibbons commented Oct 19, 2020

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Oct 19, 2020

@jonathan-gibbons 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:

8255032: Conflict between recent pushes breaks the build

Reviewed-by: redestad, vromero

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.

@openjdk openjdk bot added the ready label Oct 19, 2020
@openjdk openjdk bot closed this Oct 19, 2020
@openjdk openjdk bot added integrated and removed ready rfr labels Oct 19, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Oct 19, 2020

@jonathan-gibbons Pushed as commit 0f4fb36.

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

@jonathan-gibbons jonathan-gibbons deleted the jonathan-gibbons:8255032-build-breakage branch Oct 19, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants