Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Feb 14, 2022

This is an automatic backport of pull request #7272 done by Mergify.
Cherry-pick of ec38207 has failed:

On branch mergify/bp/7.17/pr-7272
Your branch is up to date with 'origin/7.17'.

You are currently cherry-picking commit ec38207e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   systemtest/containers.go

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit ec38207)

# Conflicts:
#	systemtest/containers.go
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Feb 14, 2022
@mergify mergify bot assigned axw Feb 14, 2022
@ghost
Copy link

ghost commented Feb 14, 2022

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /hey-apm : Run the hey-apm benchmark.

  • /package : Generate and publish the docker images.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@mergify
Copy link
Contributor Author

mergify bot commented Feb 14, 2022

This pull request has not been merged yet. Could you please review and merge it @axw? 🙏

@axw axw removed the conflicts There is a conflict in the backported pull request label Feb 14, 2022
@axw axw enabled auto-merge (squash) February 14, 2022 06:56
@axw
Copy link
Member

axw commented Feb 15, 2022

/test

@axw axw merged commit 3da89fd into 7.17 Feb 15, 2022
@axw axw deleted the mergify/bp/7.17/pr-7272 branch February 15, 2022 13:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants