Cherry-pick #8464 to 6.4: Remove line carriages on asset generation #8466
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
On Windows, asset files can contain line carriages, what leads to different encoded assets. Remove these carriages between encoding the string. (cherry picked from commit aafff49)
narph
added a commit
to narph/beats
that referenced
this pull request
Sep 27, 2018
thanks @jsoriano for elastic#8466
andrewvc
reviewed
Sep 27, 2018
| @@ -34,6 +34,7 @@ The list below covers the major changes between 6.3.0 and master only. | |||
|
|
|||
| - Fix permissions of generated Filebeat filesets. {pull}7140[7140] | |||
| - Collect fields from _meta/fields.yml too. {pull}8397[8397] | |||
| - Fix issue on asset generation that could lead to different results in Windows. {pull}8464[8464] | |||
There was a problem hiding this comment.
Is CHANGELOG-developer.asciidoc the correct doc to target?
I notice other PRs like https://github.com/elastic/beats/pull/8147/files target CHANGELOG.asciidoc
There was a problem hiding this comment.
The change in this PR only affects development, it doesn't have any effect on functionality.
andrewvc
approved these changes
Sep 28, 2018
leweafan
pushed a commit
to leweafan/beats
that referenced
this pull request
Apr 28, 2023
On Windows, asset files can contain line carriages, what leads to different encoded assets. Remove these carriages between encoding the string. (cherry picked from commit 97927b9)
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.
Cherry-pick of PR #8464 to 6.4 branch. Original message:
On Windows, asset files can contain line carriages, what leads to
different encoded assets. Remove this carriages between encoding the
string.
This can be what is generating different asset files on #8394, thanks
to @narph for pointing to the possibility of carriages causing this
problem.