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

Projects
None yet
4 participants
@dedemorton
Copy link
Contributor

dedemorton commented May 1, 2017

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

Please feel free to merge this upon review.

dedemorton and others added some commits Apr 28, 2017

Update docs.asciidoc (#4095)
fsstats doesn't work anymore because of a previous merge. 
Would be helpful to change fsstats -> fsstat to avoid confusion.
@tsg

tsg approved these changes May 2, 2017

Copy link
Collaborator

tsg left a comment

LGTM.

@tsg tsg merged commit 41aa485 into elastic:5.4 May 2, 2017

6 checks passed

CLA Commit author has signed the CLA
Details
codecov/patch Coverage not affected when comparing 388ace0...f70499c
Details
codecov/project 65.53% (-0.04%) compared to 388ace0
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
default Build finished.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.