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

Backport: Cherrypick #4148, #4108, #4095 into 5.4 #4161

Merged
merged 3 commits into from
May 2, 2017

Conversation

dedemorton
Copy link
Contributor

Cherrypicks #4148, #4108, and #4095 into 5.4.

Please feel free to merge this upon review.

dedemorton and others added 3 commits May 1, 2017 11:01
fsstats doesn't work anymore because of a previous merge. 
Would be helpful to change fsstats -> fsstat to avoid confusion.
Copy link
Contributor

@tsg tsg left a comment

Choose a reason for hiding this comment

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

LGTM.

@tsg tsg merged commit 41aa485 into elastic:5.4 May 2, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants