Automatic merge from 5.3 to 5.x branch #3894
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…lastic#3816) As they are not reported by some systems Closes elastic#3074 (cherry picked from commit 3b4a945)
* Add conditional coding requested in elastic#3649 * Fix heading level * Fixes elastic#3783 * Set release state to released in prep for 5.3
missing heartbeat name
…stic#3865) Fixes elastic#3857 (cherry picked from commit 559b9d3)
(cherry picked from commit 5e947a0)
Replace dashboard
The version.asciidoc is used during packaging to read out the version number. Recently a comment was introduce in the file which broke the packaging. In before_build.sh the content of the file is copied over and converted to yaml, see https://github.com/elastic/beats/blob/master/dev-tools/packer/xgo-scripts/before_build.sh#L58. As these lines to not seem to be required, I removed them. Alternatively the sed script could be adapted which would be more complex.
The fix in elastic#3645 had a bug (chmod executed on the wrong folder). This fixes the fix and also adds permissions checks to the tests.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Bringing all the recent changes from the 5.3 branch to 5.x. There were no code conflicts.