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

[7.17](backport #1854) Add error detail to catch-all HTTP response #1882

Merged
merged 2 commits into from
Sep 23, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 20, 2022

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

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

You are currently cherry-picking commit c51c26f.
  (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:   cmd/fleet/error.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.next.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

(cherry picked from commit c51c26f)

# Conflicts:
#	CHANGELOG.next.asciidoc
@mergify mergify bot requested a review from a team as a code owner September 20, 2022 11:12
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 20, 2022
@elasticmachine
Copy link
Contributor

elasticmachine commented Sep 20, 2022

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2022-09-20T11:14:02.780+0000

  • Duration: 9 min 1 sec

Test stats 🧪

Test Results
Failed 0
Passed 236
Skipped 0
Total 236

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the GitHub comments

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

  • /test : Re-trigger the build.

@joshdover joshdover removed the conflicts There is a conflict in the backported pull request label Sep 23, 2022
@joshdover joshdover merged commit a9de13c into 7.17 Sep 23, 2022
@joshdover joshdover deleted the mergify/bp/7.17/pr-1854 branch September 23, 2022 11:53
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