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 "add flag.Parse so HandlFlags works correctly (#14214)" #14292

Merged
merged 2 commits into from
Oct 9, 2024

Conversation

carsonip
Copy link
Member

@carsonip carsonip commented Oct 8, 2024

This reverts commit 7efa6d5.

Require beats bump / revert #14310 (8.x: #14309 )
Part of #14280

Motivation/summary

Checklist

For functional changes, consider:

  • Is it observable through the addition of either logging or metrics?
  • Is its use being published in telemetry to enable product improvement?
  • Have system tests been added to avoid regression?

How to test these changes

Related issues

Copy link
Contributor

mergify bot commented Oct 8, 2024

This pull request does not have a backport label. Could you fix it @carsonip? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-7.17 is the label to automatically backport to the 7.17 branch.
  • backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit.
  • backport-8.x is the label to automatically backport to the 8.x branch.

Copy link
Contributor

mergify bot commented Oct 8, 2024

backport-8.x has been added to help with the transition to the new branch 8.x.
If you don't need it please use backport-skip label.

@mergify mergify bot added the backport-8.x Automated backport to the 8.x branch with mergify label Oct 8, 2024
carsonip added a commit that referenced this pull request Oct 9, 2024
Unblock 8.x backport of #14292 to fix #14280. Reverting beats instead of
bumping beats to avoid #14297.
carsonip added a commit to carsonip/apm-server that referenced this pull request Oct 9, 2024
Unblock elastic#14292 to fix elastic#14280. Reverting beats instead of
bumping beats to avoid elastic#14297.
carsonip added a commit that referenced this pull request Oct 9, 2024
This reverts commit 7f85cd6.

Unblock #14292 to fix #14280. Reverting beats instead of
bumping beats to avoid #14297.
@carsonip carsonip marked this pull request as ready for review October 9, 2024 12:59
@carsonip carsonip requested a review from a team as a code owner October 9, 2024 12:59
@carsonip carsonip requested a review from kruskall October 9, 2024 13:01
carsonip added a commit that referenced this pull request Oct 9, 2024
This reverts commit e258527.

Unblock #14292 to fix #14280. Reverting beats instead of
bumping beats to avoid #14297.
@carsonip carsonip enabled auto-merge (squash) October 9, 2024 14:09
@carsonip
Copy link
Member Author

carsonip commented Oct 9, 2024

Tested that this PR fixes #14280 on main.

@carsonip carsonip merged commit 01237c4 into elastic:main Oct 9, 2024
11 checks passed
mergify bot pushed a commit that referenced this pull request Oct 9, 2024
This reverts commit 7efa6d5.

Require beats bump / revert #14310 (8.x: #14309 )
Part of #14280

(cherry picked from commit 01237c4)
mergify bot added a commit that referenced this pull request Oct 9, 2024
… (#14314)

This reverts commit 7efa6d5.

Require beats bump / revert #14310 (8.x: #14309 )
Part of #14280

(cherry picked from commit 01237c4)

Co-authored-by: Carson Ip <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-8.x Automated backport to the 8.x branch with mergify
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants