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.12](backport #3260) Fix fleet-server.reference.yml indentation #3265

Merged
merged 2 commits into from
Feb 12, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 9, 2024

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

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

You are currently cherry-picking commit f58c107.
  (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:   fleet-server.reference.yml

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/pull-requests/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 f58c107)

# Conflicts:
#	fleet-server.reference.yml
@mergify mergify bot requested a review from a team as a code owner February 9, 2024 16:14
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Feb 9, 2024
Copy link

Quality Gate passed Quality Gate passed

Kudos, no new issues were introduced!

0 New issues
0 Security Hotspots
No Coverage information No data about Coverage
No Duplication information No data about Duplication

See analysis details on SonarQube

@pierrehilbert pierrehilbert removed the conflicts There is a conflict in the backported pull request label Feb 11, 2024
@pierrehilbert pierrehilbert enabled auto-merge (squash) February 11, 2024 12:29
Copy link
Contributor Author

mergify bot commented Feb 12, 2024

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

@pierrehilbert pierrehilbert merged commit 027670d into 8.12 Feb 12, 2024
@pierrehilbert pierrehilbert deleted the mergify/bp/8.12/pr-3260 branch February 12, 2024 09:01
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.

2 participants