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 Consul Telemetry acceptance test into release/1.1.x #2217

Merged

Conversation

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

Backport

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

🚨

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:
@chapmanc
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: unable to process merge commit: "f5826b728ac18f99b7c8e25c29a74812d5fef709", automatic backport requires rebase workflow

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


Changes proposed in this PR:

  • adds in an HCP acceptance test with a mocked out HCP server for acceptance testing the collector and consul core

How I've tested this PR:

How I expect reviewers to test this PR:

Checklist:

  • Tests added
  • CHANGELOG entry added

    HashiCorp engineers only, community PRs should not add a changelog entry.
    Entries should use present tense (e.g. Add support for...)


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/chappie/hcp/tests/grossly-outgoing-ocelot branch from be86d09 to 910b48c Compare May 31, 2023 01:50
@chapmanc chapmanc force-pushed the backport/chappie/hcp/tests/grossly-outgoing-ocelot branch from 910b48c to a29ccc7 Compare June 1, 2023 16:30
@curtbushko curtbushko marked this pull request as ready for review June 1, 2023 16:33
@curtbushko curtbushko self-requested a review June 1, 2023 16:33
@chapmanc chapmanc merged commit 76494da into release/1.1.x Jun 1, 2023
@chapmanc chapmanc deleted the backport/chappie/hcp/tests/grossly-outgoing-ocelot branch June 1, 2023 17:05
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