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

Merge back release-2.36 #10850

Merged
merged 4 commits into from
Jun 9, 2022
Merged

Merge back release-2.36 #10850

merged 4 commits into from
Jun 9, 2022

Conversation

metalmatze
Copy link
Member

No description provided.

roidelapluie and others added 4 commits June 9, 2022 15:11
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
This keeps the previous behaviour of printing details about duplicate
rules but doesn't exit with a fatal exit code unless turned on.

Signed-off-by: David Leadbeater <dgl@dgl.cx>

Co-authored-by: David Leadbeater <dgl@dgl.cx>
Signed-off-by: Matthias Loibl <mail@matthiasloibl.com>
Add v2.36.1 CHANGELOG and VERSION update
@metalmatze metalmatze requested review from dgl and juliusv as code owners June 9, 2022 16:05
@roidelapluie roidelapluie merged commit a84c472 into main Jun 9, 2022
@roidelapluie
Copy link
Member

Thanks!

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