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

Revert "Revise wait_for_integration ES implementation (#12150)" #12240

Merged
merged 2 commits into from
Dec 19, 2023

Conversation

axw
Copy link
Member

@axw axw commented Dec 19, 2023

Revert #12150 -- see #12239

@axw axw added v8.12.0 backport-8.12 Automated backport with mergify labels Dec 19, 2023
@axw axw marked this pull request as ready for review December 19, 2023 11:27
@axw axw requested a review from a team as a code owner December 19, 2023 11:27
@simitt simitt enabled auto-merge (squash) December 19, 2023 15:18
@simitt simitt merged commit 54e367c into elastic:main Dec 19, 2023
10 of 11 checks passed
mergify bot pushed a commit that referenced this pull request Dec 19, 2023
This reverts commit 3e54384.

(cherry picked from commit 54e367c)

# Conflicts:
#	internal/beater/checkintegration.go
@axw axw deleted the revert-12150 branch December 19, 2023 23:27
mergify bot added a commit that referenced this pull request Dec 19, 2023
…" (backport #12240) (#12249)

* Revert "Revise wait_for_integration ES implementation (#12150)" (#12240)

This reverts commit 3e54384.

(cherry picked from commit 54e367c)

# Conflicts:
#	internal/beater/checkintegration.go

* Fix merge conflict

---------

Co-authored-by: Andrew Wilkins <[email protected]>
v1v added a commit to v1v/apm-server that referenced this pull request Dec 21, 2023
…lease-process

* upstream/main:
  Remove Nassim Kammah from list of maintainers (elastic#12269)
  docs: Add tagged regions to changelog (elastic#12251)
  Update apm data (elastic#12242)
  Revert "Revise wait_for_integration ES implementation (elastic#12150)" (elastic#12240)
v1v added a commit to v1v/apm-server that referenced this pull request Dec 21, 2023
…r-elastic

* upstream/main:
  [updatecli] Bump elastic stack version to 8.13.0-yufkxnwm (elastic#12246)
  Remove Nassim Kammah from list of maintainers (elastic#12269)
  docs: Add tagged regions to changelog (elastic#12251)
  Update apm data (elastic#12242)
  Revert "Revise wait_for_integration ES implementation (elastic#12150)" (elastic#12240)
  ci(release): automate release steps (elastic#12234)
  build(deps): bump the github-actions group with 1 update (elastic#12232)
  [updatecli] Update to elastic/beats@a633696068ed (elastic#12164)
  [updatecli] Bump elastic stack version to 8.13.0-h30gube9 (elastic#12235)
  smoke-test: semver sort latest versions (elastic#12229)
  [updatecli] Bump Golang version to 1.21.5 (elastic#12191)
  fix: always try to remap both span and error stacktraces (elastic#12221)
  [updatecli] Bump elastic stack version to 8.13.0-6av99u5d (elastic#12169)
  docs: Update changelogs for 8.12 release (elastic#12172)
amannocci pushed a commit that referenced this pull request Dec 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-8.12 Automated backport with mergify v8.12.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants