Skip to content

Commit

Permalink
Properly fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@aidanleuck
aidanleuck committed Dec 2, 2024
1 parent e8c8e36 commit ddbca7b
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ Main (unreleased)

- Add support for server authentication to otelcol components. (@aidaleuc)

### Bugfixes
- Logs from underlying clustering library `memberlist` are now surfaced with correct level (@thampiotr)

- Update mysqld_exporter from v0.15.0 to v0.16.0 (including 2ef168bf6), most notable changes: (@cristiangreco)
Expand Down

0 comments on commit ddbca7b

Please sign in to comment.