Skip to content

rebase #1824 on 1.0.x#1829

Merged
thisisnotashwin merged 1 commit intorelease/1.0.xfrom
ashwin/rebase-annotation-1.0.x
Jan 13, 2023
Merged

rebase #1824 on 1.0.x#1829
thisisnotashwin merged 1 commit intorelease/1.0.xfrom
ashwin/rebase-annotation-1.0.x

Conversation

@thisisnotashwin
Copy link
Copy Markdown
Contributor

No description provided.

@thisisnotashwin thisisnotashwin changed the base branch from main to release/1.0.x January 12, 2023 20:39
CHANGELOG.md Outdated
IMPROVEMENTS:
* Helm:
* Add a `global.extraLabels` stanza to allow setting global Kubernetes labels for all components deployed by the `consul-k8s` Helm chart. [[GH-1778](https://github.com/hashicorp/consul-k8s/pull/1778)]
* Add the `accessLogs` field to the `ProxyDefaults` CRD. [[GH-1816](https://github.com/hashicorp/consul-k8s/pull/1816)]
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Looks like there are more changes than in the original PR, are we perhaps missing another PR?

@thisisnotashwin thisisnotashwin force-pushed the ashwin/rebase-annotation-1.0.x branch from db317fd to e0967dc Compare January 12, 2023 20:59
@thisisnotashwin thisisnotashwin merged commit 6256e76 into release/1.0.x Jan 13, 2023
@thisisnotashwin thisisnotashwin deleted the ashwin/rebase-annotation-1.0.x branch January 13, 2023 16:11
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.

2 participants