Skip to content

Backport of Add changelog entry for 1.16.0 into release/1.16.x#17989

Merged
nathancoleman merged 2 commits intorelease/1.16.xfrom
backport/NET-4630/1.16-changelog-main/neatly-meet-orca
Jun 30, 2023
Merged

Backport of Add changelog entry for 1.16.0 into release/1.16.x#17989
nathancoleman merged 2 commits intorelease/1.16.xfrom
backport/NET-4630/1.16-changelog-main/neatly-meet-orca

Conversation

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

Backport

This PR is auto-generated from #17987 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:
@nathancoleman
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.


Description

Porting over the 1.16.0 changelog entry from the release/1.16.0 branch

Testing & Reproduction steps

Links

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/NET-4630/1.16-changelog-main/neatly-meet-orca branch from 46ae78b to 73ab038 Compare June 30, 2023 20:30
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/NET-4630/1.16-changelog-main/neatly-meet-orca branch from 73ab038 to 46ae78b Compare June 30, 2023 20:30
@hashicorp-cla
Copy link

hashicorp-cla commented Jun 30, 2023

CLA assistant check

Thank you for your submission! We require that all contributors sign our Contributor License Agreement ("CLA") before we can accept the contribution. Read and sign the agreement

Learn more about why HashiCorp requires a CLA and what the CLA includes


1 out of 2 committers have signed the CLA.

  • nathancoleman
  • temp

temp seems not to be a GitHub user.
You need a GitHub account to be able to sign the CLA. If you already have a GitHub account, please add the email address used for this commit to your account.

Have you signed the CLA already but the status is still pending? Recheck it.

Copy link
Collaborator

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

@nathancoleman nathancoleman marked this pull request as ready for review June 30, 2023 20:32
@nathancoleman nathancoleman enabled auto-merge (squash) June 30, 2023 20:33
@nathancoleman nathancoleman disabled auto-merge June 30, 2023 21:01
@nathancoleman nathancoleman merged commit d4a9d1a into release/1.16.x Jun 30, 2023
@nathancoleman nathancoleman deleted the backport/NET-4630/1.16-changelog-main/neatly-meet-orca branch June 30, 2023 21:01
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.

4 participants