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.

Sign up for GitHub

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

Jump to bottom

Fix up a merge conflict on log filter #4815

Merged
merged 2 commits into from Nov 24, 2021
Merged

Fix up a merge conflict on log filter #4815

merged 2 commits into from Nov 24, 2021

Conversation

cyriltovena
Copy link
Contributor

@jeschkies We merge your PR before my improvement on case insensitive search.

This ensure we use it everywhere.

@cyriltovena
Fix up a merge conflict on log filter
186741a 
Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
@cyriltovena
use the same parameter order as the stdlib
bd2a1ba 
Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
@cyriltovena cyriltovena requested a review from a team as a code owner November 24, 2021 13:54
jeschkies
jeschkies approved these changes Nov 24, 2021
View reviewed changes
Copy link
Contributor

@jeschkies jeschkies left a comment

Choose a reason for hiding this comment

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

Thanks! 🙏

@cyriltovena cyriltovena merged commit 45ed6d5 into grafana:main Nov 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jeschkies jeschkies jeschkies approved these changes

Assignees
No one assigned
Labels
size/M
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@cyriltovena @jeschkies