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.x](backport #26587) [7.x](backport #25219) Introduce httpcommon package in libbeat (add support for Proxy) #26624

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 30, 2021

This is an automatic backport of pull request #26587 done by Mergify.
Cherry-pick of 37e37f1 has failed:

On branch mergify/bp/7.x/pr-26587
Your branch is up to date with 'origin/7.x'.

You are currently cherry-picking commit 37e37f1f9.
  (all conflicts fixed: 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)

nothing to commit, working tree clean

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/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/

…upport for Proxy) (#26587)

* Introduce httpcommon package in libbeat (add support for Proxy) (#25219)

(cherry picked from commit 4accfa8)

# Conflicts:
#	libbeat/monitoring/report/elasticsearch/config.go
#	metricbeat/module/elasticsearch/index/data_test.go

* Fix issues with backport.

* Fix changelog.

* FIx integration tests for ml-importer.

Co-authored-by: Steffen Siering <steffen.siering@elastic.co>
Co-authored-by: Blake Rouse <blake.rouse@elastic.co>
(cherry picked from commit 37e37f1)
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jun 30, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jun 30, 2021
@botelastic
Copy link

botelastic bot commented Jun 30, 2021

This pull request doesn't have a Team:<team> label.

@blakerouse
Copy link
Contributor

This is wrong should go into 7.14 branch now, not 7.x

@blakerouse blakerouse closed this Jun 30, 2021
@mergify mergify bot deleted the mergify/bp/7.x/pr-26587 branch June 30, 2021 18:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant