This repository was archived by the owner on Sep 17, 2024. It is now read-only.

[7.17](backport #2772) chore: stringify http responses#3016

Merged

kuisathaverat merged 7 commits into7.17from

mergify/bp/7.17/pr-2772

Nov 10, 2022

Contributor

mergify bot commented Sep 14, 2022

This is an automatic backport of pull request #2772 done by Mergify.
Cherry-pick of 859e9e5 has failed:

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

You are currently cherry-picking commit 859e9e5a.
  (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:   internal/kibana/agents.go
	modified:   internal/kibana/integrations.go
	modified:   internal/kibana/policies.go

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

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


          chore: stringify http responses (#2772)

76e0411

(cherry picked from commit 859e9e5)

# Conflicts:
#	internal/kibana/server.go

mergify bot added the conflicts label

Contributor

elasticmachine commented Sep 14, 2022 •

edited

Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS

Expand to view the summary

Build stats

Start Time: 2022-11-10T13:09:56.436+0000
Duration: 67 min 36 sec

Test stats 🧪

Test	Results
Failed	0
Passed	168
Skipped	0
Total	168

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

Contributor Author

mergify bot commented Sep 19, 2022

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

3 similar comments

Contributor Author

mergify bot commented Sep 26, 2022

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

Contributor Author

mergify bot commented Oct 3, 2022

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

Contributor Author

mergify bot commented Oct 10, 2022

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

Contributor

kuisathaverat commented Oct 13, 2022

/test


          Merge branch '7.17' into mergify/bp/7.17/pr-2772

312a2c9

Contributor Author

mergify bot commented Oct 17, 2022

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


          Merge branch '7.17' into mergify/bp/7.17/pr-2772

37db2ce

Contributor Author

mergify bot commented Oct 24, 2022

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

1 similar comment

Contributor Author

mergify bot commented Oct 31, 2022

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

kuisathaverat enabled auto-merge (squash)

October 31, 2022 09:00


          Merge branch '7.17' into mergify/bp/7.17/pr-2772

dd68190

Contributor Author

mergify bot commented Nov 7, 2022

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


          Update server.go

3c3eee7

kuisathaverat reviewed

View reviewed changes

internal/kibana/server.go Outdated Show resolved Hide resolved


          Update internal/kibana/server.go

d994693

kuisathaverat disabled auto-merge

November 10, 2022 13:09

kuisathaverat enabled auto-merge (squash)

November 10, 2022 13:09


          Merge branch '7.17' into mergify/bp/7.17/pr-2772

kuisathaverat merged commit 18d9652 into 7.17

mergify bot deleted the mergify/bp/7.17/pr-2772 branch

November 10, 2022 14:16

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels