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

466: Exception during sponsored integration #744

Closed
wants to merge 1 commit into from

Conversation

rwestberg
Copy link
Member

@rwestberg rwestberg commented Aug 26, 2020

Hi all,

Please review this change that serializes integrations (per repository), to avoid unnecessary push failures when the /integrate command has been issued in multiple PRs around the same time.

Best regards,
Robin


Progress

  • Change must not contain extraneous whitespace
  • Change must be properly reviewed

Issues

  • SKARA-466: Exception during sponsored integration
  • SKARA-528: Exception during integration

Reviewers

  • Erik Helin (ehelin - Reviewer)

Download

$ git fetch https://git.openjdk.java.net/skara pull/744/head:pull/744
$ git checkout pull/744

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Aug 26, 2020

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

@openjdk openjdk bot changed the title 466 466: Exception during sponsored integration Aug 26, 2020
@rwestberg
Copy link
Member Author

@rwestberg rwestberg commented Aug 26, 2020

/solves 528

@openjdk
Copy link

@openjdk openjdk bot commented Aug 26, 2020

@rwestberg
Adding additional issue to solves list: 528: Exception during integration.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Aug 26, 2020

Webrevs

edvbld
edvbld approved these changes Aug 26, 2020
Copy link
Member

@edvbld edvbld left a comment

Looks good!

@openjdk
Copy link

@openjdk openjdk bot commented Aug 26, 2020

@rwestberg This change now passes all automated pre-integration checks. When the change also fulfills all project specific requirements, type /integrate in a new comment to proceed. After integration, the commit message will be:

466: Exception during sponsored integration
528: Exception during integration

Reviewed-by: ehelin
  • 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.

Since the source branch of this PR was last updated there have been 2 commits pushed to the master branch:

  • 90bb640: bots: add checkout bot
  • 089215d: Store target hash before potentially fetching the ref

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid automatic rebasing, please merge master into your branch, and then specify the current head hash when integrating, like this: /integrate 90bb6406140352e0b6a3c559411abf5b7de2f6c0.

➡️ 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 Aug 26, 2020
@rwestberg
Copy link
Member Author

@rwestberg rwestberg commented Aug 26, 2020

/integrate

@openjdk openjdk bot closed this Aug 26, 2020
@openjdk openjdk bot added integrated and removed ready labels Aug 26, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Aug 26, 2020

@rwestberg The following commits have been pushed to master since your change was applied:

  • 90bb640: bots: add checkout bot
  • 089215d: Store target hash before potentially fetching the ref

Your commit was automatically rebased without conflicts.

Pushed as commit 2851535.

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