8000 Missing important fixes from 5.11 in main and 5.12 · Issue #3542 · collectd/collectd · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Missing important fixes from 5.11 in main and 5.12 #3542

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
Closed
kwiatrox opened this issue Aug 26, 2020 · 3 comments
Closed

Missing important fixes from 5.11 in main and 5.12 #3542

kwiatrox opened this issue Aug 26, 2020 · 3 comments

Comments

@kwiatrox
Copy link
Member

It seems that some fixes originating from 5.10 and later merged to 5.11 are still missing in main and are therefore not present in 5.12 branch.
#3413
#3449
#3459
Additionally #2470 was merged to master instead of main and is also missing in 5.12 branch.
@sunkuranganath
Copy link
Member

Should we cherry pick these and merge onto main branch?

@kwiatrox
Copy link
Member Author

@sunkuranganath I think that merge would be better than cherry-pick to not change commit ids. We need it in 5.12 branch, but putting it also in main is a good idea imho.

@octo
Copy link
Member
octo commented Sep 3, 2020

I merged #2470 into main with 70296d5

The other PRs you mentioned have already made their way into collectd-5.12 via collectd-5.11.

@octo octo closed this as completed Sep 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
3 participants
@octo @sunkuranganath @kwiatrox
0