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

Fix main build failing #9722

Merged
merged 1 commit into from
Feb 5, 2021
Merged

Fix main build failing #9722

merged 1 commit into from
Feb 5, 2021

Conversation

dnephin
Copy link
Contributor

@dnephin dnephin commented Feb 5, 2021

An old PR (#7623) was merged after #9585. The old code was incompatible with the new
changes, but none of the lines caused a git conflict so the merge was allowed.

The incompatible changes caused the tests to fail. This fixes the old code to
work with the new changes.

@github-actions github-actions bot added theme/certificates Related to creating, distributing, and rotating certificates in Consul theme/tls Using TLS (Transport Layer Security) or mTLS (mutual TLS) to secure communication labels Feb 5, 2021
@hashicorp-ci
Copy link
Contributor

🤔 Double check that this PR does not require a changelog entry in the .changelog directory. Reference

@dnephin dnephin force-pushed the dnephin/fix-master-build branch from 90e6f89 to 058c836 Compare February 5, 2021 22:23
@vercel vercel bot temporarily deployed to Preview – consul-ui-staging February 5, 2021 22:23 Inactive
@vercel vercel bot temporarily deployed to Preview – consul February 5, 2021 22:23 Inactive
An old PR (#7623) was merged after #9585. The old code was incompatible with the new
changes, but none of the lines caused a git conflict so the merge was allowed.

The incompatible changes caused the tests to fail. This fixes the old code to
work with the new changes.
@dnephin dnephin force-pushed the dnephin/fix-master-build branch from 058c836 to f744e03 Compare February 5, 2021 22:26
@vercel vercel bot temporarily deployed to Preview – consul February 5, 2021 22:26 Inactive
@vercel vercel bot temporarily deployed to Preview – consul-ui-staging February 5, 2021 22:26 Inactive
Copy link
Member

@rboyer rboyer left a comment

Choose a reason for hiding this comment

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

LGTM

@dnephin dnephin merged commit ddf292c into master Feb 5, 2021
@dnephin dnephin deleted the dnephin/fix-master-build branch February 5, 2021 23:13
@hashicorp-ci
Copy link
Contributor

🍒 If backport labels were added before merging, cherry-picking will start automatically.

To retroactively trigger a backport after merging, add backport labels and re-run https://circleci.com/gh/hashicorp/consul/323965.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
theme/certificates Related to creating, distributing, and rotating certificates in Consul theme/tls Using TLS (Transport Layer Security) or mTLS (mutual TLS) to secure communication
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants