Cherry-pick #10982 to 6.7: Detect if the configured and the migrated registry paths are the same #11085
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
…elastic#10982) * do not do anything if the configured registry and the migrated path are the same && fix E2E tests * fix test configuration * fix whitespaces * more whitespace fixes (cherry picked from commit 54fe095)
|
Failing tests are unrelated. |
michalpristas
approved these changes
Mar 8, 2019
DStape
pushed a commit
to DStape/beats
that referenced
this pull request
Aug 20, 2019
…elastic#10982) (elastic#11085) Cherry-pick of PR elastic#10982 to 6.7 branch. Original message: The E2E test of starting Journalbeat with an existing registry broke when I have added support and tests for `include_matches`. Thus, when I added the migration of the registry file, the issue was not detected. Now both the code and the test are fixed.
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 #10982 to 6.7 branch. Original message:
The E2E test of starting Journalbeat with an existing registry broke when I have added support and tests for
include_matches. Thus, when I added the migration of the registry file, the issue was not detected.Now both the code and the test are fixed.