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

[8.10] build: mark apm-server.yml as config|noreplace in nfpm config (backport #11808) #11811

Merged
merged 4 commits into from
Oct 10, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 10, 2023

This is an automatic backport of pull request #11808 done by Mergify.
Cherry-pick of 02b0d87 has failed:

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

You are currently cherry-picking commit 02b0d8786.
  (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:   packaging/nfpm.yml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   changelogs/head.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.com

* build: mark apm-server.yml as config|noreplace in nfpm config

* changelog: add changelog entry

(cherry picked from commit 02b0d87)

# Conflicts:
#	changelogs/head.asciidoc
@mergify mergify bot requested a review from a team as a code owner October 10, 2023 14:17
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 10, 2023
@kruskall
Copy link
Member

@Mergifyio update

@mergify
Copy link
Contributor Author

mergify bot commented Oct 10, 2023

update

✅ Branch has been successfully updated

@kruskall kruskall removed the conflicts There is a conflict in the backported pull request label Oct 10, 2023
@mergify mergify bot merged commit cfa4d5a into 8.10 Oct 10, 2023
@mergify mergify bot deleted the mergify/bp/8.10/pr-11808 branch October 10, 2023 20:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant