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

Fixed docker diskio bug due to reseting of map. (#5582) #5705

Merged
merged 3 commits into from
Nov 27, 2017

Conversation

kwojcicki
Copy link
Contributor

  • Fixed docker diskio bug due to reseting of map.

Backport of #5582

Fixes #5568

* Fixed docker diskio bug due to reseting of map.

Fixes elastic#5568
@elasticmachine
Copy link
Collaborator

Can one of the admins verify this patch?

Copy link
Contributor

@ruflin ruflin left a comment

Choose a reason for hiding this comment

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

Do you also plan to open a PR against 6.0 or should we take care of this?

@@ -37,6 +37,10 @@ https://github.com/elastic/beats/compare/v5.6.4...5.6[Check the HEAD diff]
*Metricbeat*

- Clarify meaning of percentages reported by system core metricset. {pull}5565[5565]
- Change field type of http header from nested to object {pull}5258[5258]
Copy link
Contributor

Choose a reason for hiding this comment

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

It seems some more stuff has sneaked into the CHANGELOG. Can you remove this?

@ruflin
Copy link
Contributor

ruflin commented Nov 26, 2017

jenkins, test it

@kwojcicki
Copy link
Contributor Author

Already opened a PR for 6.0 #5698 😄 Will update changelog

@ruflin
Copy link
Contributor

ruflin commented Nov 27, 2017

@kwojcicki Sorry, somehow missed that one :-( Can you update the Changelog there too?

@kwojcicki
Copy link
Contributor Author

@ruflin Updated changelog for both PRs will ping you on the other so you can find it.

@ruflin
Copy link
Contributor

ruflin commented Nov 27, 2017

jenkins, test it

@ruflin ruflin merged commit b1807df into elastic:5.6 Nov 27, 2017
@ruflin
Copy link
Contributor

ruflin commented Nov 27, 2017

@kwojcicki Thanks a lot for the contribution + backports.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants