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 to 5.5: #4530 #4542 #4547 #4628 #4617 #4629

Merged
merged 6 commits into from Jul 11, 2017

Conversation

Projects
None yet
5 participants
@dedemorton
Copy link
Contributor

commented Jul 7, 2017

Cherry-picks the following doc PRs into 5.5: #4530 #4542 #4547 #4628 #4617

When I resolved conflicts, I noticed that a previously merged PR (#3581) incorrectly added /bin to the path for zip, tar.gz, and tgz. So I fixed it in this PR.

dedemorton and others added some commits Jun 20, 2017

Fix path.conf in docs to path.config (#4547)
In some docs file `path.conf` instead of `path.config` was mentioned. To reduce confusion I also changed the type from `conf` to `config`.

@andrewkroh andrewkroh merged commit c031569 into elastic:5.5 Jul 11, 2017

5 of 6 checks passed

beats-ci Build finished.
Details
CLA Commit author is a member of Elasticsearch
Details
codecov/patch Coverage not affected when comparing 142f8fe...65ccdc3
Details
codecov/project 63.76% (-0.03%) compared to 142f8fe
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
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.