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

Backport of Fix more test flakes into release/1.16.x #19545

Conversation

hc-github-team-consul-core
Copy link
Contributor

Backport

This PR is auto-generated from #19533 to be assessed for backporting due to the inclusion of the label backport/1.16.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@hashi-derek
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: POST https://api.github.com/repos/hashicorp/consul/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


Original PR had no description content.


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/derekm/fix-more-flakes/really-certain-pigeon branch from 09931ab to 1be01a3 Compare November 7, 2023 16:16
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/derekm/fix-more-flakes/really-certain-pigeon branch 2 times, most recently from 8c468ae to 1be01a3 Compare November 7, 2023 16:16
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto approved Consul Bot automated PR

@hashi-derek hashi-derek marked this pull request as ready for review November 7, 2023 16:40
@hashi-derek hashi-derek merged commit 902eca3 into release/1.16.x Nov 7, 2023
83 checks passed
@hashi-derek hashi-derek deleted the backport/derekm/fix-more-flakes/really-certain-pigeon branch November 7, 2023 16:47
mbrulatout pushed a commit to criteo-forks/consul that referenced this pull request Jan 5, 2024
* backport of commit 5cb614e

* Fix flaky metrics tests.

---------

Co-authored-by: Derek Menteer <derek.menteer@hashicorp.com>
mbrulatout pushed a commit to criteo-forks/consul that referenced this pull request Jan 9, 2024
* backport of commit 5cb614e

* Fix flaky metrics tests.

---------

Co-authored-by: Derek Menteer <derek.menteer@hashicorp.com>
mbrulatout pushed a commit to criteo-forks/consul that referenced this pull request Jan 9, 2024
* backport of commit 5cb614e

* Fix flaky metrics tests.

---------

Co-authored-by: Derek Menteer <derek.menteer@hashicorp.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants