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

Release 1.2.1 #2100

Merged
merged 3 commits into from
Aug 5, 2021
Merged

Release 1.2.1 #2100

merged 3 commits into from
Aug 5, 2021

Conversation

SuperQ
Copy link
Member

@SuperQ SuperQ commented Jul 23, 2021

Capture permission denied error for "energy_uj" file.

Fixes: #1892

Signed-off-by: Ben Kochie <superq@gmail.com>
Pull in bug fix for noisy logging.

Fixes: #2086

Signed-off-by: Ben Kochie <superq@gmail.com>
* [BUGFIX] Fix zoneinfo parsing prometheus/procfs#386
* [BUGFIX] Fix nvme collector log noise #2091
* [BUGFIX] Fix rapl collector log noise #2092

Signed-off-by: Ben Kochie <superq@gmail.com>
@mjtrangoni
Copy link
Contributor

@discordianfish @SuperQ is this forgotten or blocked by any other reason? This was merged already to master but not to release-1.2, see here.

@discordianfish
Copy link
Member

Yeah dunno what happened here :) I assume this is a dup of #2098

@mjtrangoni
Copy link
Contributor

@discordianfish this is the same commit for the release branch. I am waiting for this ☺️

@SuperQ SuperQ reopened this Aug 4, 2021
@SuperQ
Copy link
Member Author

SuperQ commented Aug 4, 2021

@discordianfish No, this is the cherry-pick to the release branch.

@discordianfish
Copy link
Member

Ahh I'm confused, nm then

@SuperQ SuperQ merged commit 4200d7f into release-1.2 Aug 5, 2021
@SuperQ SuperQ deleted the superq/integrate-1.2.1 branch August 5, 2021 09:06
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.

4 participants