Skip to content

Backport of Sync .golangci.yml from ENT into release/1.15.x#17182

Merged
analogue merged 2 commits intorelease/1.15.xfrom
backport/spatel/sync-golangci-yml-ent-to-oss/needlessly-key-colt
Apr 28, 2023
Merged

Backport of Sync .golangci.yml from ENT into release/1.15.x#17182
analogue merged 2 commits intorelease/1.15.xfrom
backport/spatel/sync-golangci-yml-ent-to-oss/needlessly-key-colt

Conversation

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

Backport

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

WARNING automatic cherry-pick of commits failed. Commits will require human attention.

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.


Syncs .golangci.yml file missed in the original protobuf modernization from ENT

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/spatel/sync-golangci-yml-ent-to-oss/needlessly-key-colt branch from f048d35 to 0ef7dfc Compare April 28, 2023 17:15
@hashicorp-cla
Copy link

hashicorp-cla commented Apr 28, 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.

  • analogue
  • 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.

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/spatel/sync-golangci-yml-ent-to-oss/needlessly-key-colt branch from 0ef7dfc to f048d35 Compare April 28, 2023 17:15
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

@analogue analogue marked this pull request as ready for review April 28, 2023 17:54
@analogue analogue merged commit 65f48d9 into release/1.15.x Apr 28, 2023
@analogue analogue deleted the backport/spatel/sync-golangci-yml-ent-to-oss/needlessly-key-colt branch April 28, 2023 18:14
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