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 a couple inconsistencies in operator usage instances command into release/1.15.x #16420

Conversation

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

Backport

This PR is auto-generated from #16260 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: unable to process merge commit: "6ed694cb789886a651af121799c80d6de10c8f23", automatic backport requires rebase workflow

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


Update one of the help texts that got missed when moving the command under operator and prevent -billable and -connect from both being set at the same time.


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/operator-usage-improvements/uniquely-united-hermit branch from 6a3ac69 to 555aa45 Compare February 24, 2023 17:51
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/operator-usage-improvements/uniquely-united-hermit branch from f1bef50 to 1f7bee8 Compare February 24, 2023 17:51
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

@github-actions github-actions bot added the theme/cli Flags and documentation for the CLI interface label Feb 24, 2023
@kyhavlov kyhavlov marked this pull request as ready for review February 24, 2023 18:01
@kyhavlov kyhavlov enabled auto-merge (squash) February 24, 2023 18:02
@kyhavlov kyhavlov merged commit 9928010 into release/1.15.x Feb 24, 2023
@kyhavlov kyhavlov deleted the backport/operator-usage-improvements/uniquely-united-hermit branch February 24, 2023 18:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
theme/cli Flags and documentation for the CLI interface
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants