Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Oct 29, 2021

This is an automatic backport of pull request #6477 done by Mergify.
Cherry-pick of 217b384 has failed:

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

You are currently cherry-picking commit 217b3841.
  (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)

Changes to be committed:
	modified:   docs/apm-breaking.asciidoc
	modified:   docs/data-model.asciidoc
	deleted:    docs/guide/install-and-run.asciidoc
	modified:   docs/ingest-pipelines.asciidoc
	modified:   docs/jaeger-integration.asciidoc
	renamed:    docs/apm-package/apm-integration.asciidoc -> docs/legacy/apm-package/apm-integration.asciidoc
	renamed:    docs/apm-package/configure.asciidoc -> docs/legacy/apm-package/configure.asciidoc
	renamed:    docs/apm-package/data-streams.asciidoc -> docs/legacy/apm-package/data-streams.asciidoc
	modified:   docs/legacy/guide/index.asciidoc
	modified:   docs/legacy/index.asciidoc
	modified:   docs/open-telemetry.asciidoc

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by them: docs/guide/apm-breaking-changes.asciidoc

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.io/

(cherry picked from commit 217b384)

# Conflicts:
#	docs/guide/apm-breaking-changes.asciidoc
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Oct 29, 2021
@ghost
Copy link

ghost commented Oct 30, 2021

🤖 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.

@bmorelli25 bmorelli25 merged commit 1fad8a4 into 7.16 Oct 30, 2021
@bmorelli25 bmorelli25 deleted the mergify/bp/7.16/pr-6477 branch October 30, 2021 01:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

conflicts There is a conflict in the backported pull request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants