Backport/6.x/pr 26205#26727
Merged
joelgriffith merged 3 commits intoelastic:6.xfrom Dec 6, 2018
joelgriffith:backport/6.x/pr-26205
Merged
Backport/6.x/pr 26205#26727joelgriffith merged 3 commits intoelastic:6.xfrom joelgriffith:backport/6.x/pr-26205
joelgriffith merged 3 commits intoelastic:6.xfrom
joelgriffith:backport/6.x/pr-26205
Conversation
azasypkin
reviewed
Dec 5, 2018
Contributor
There was a problem hiding this comment.
question: I guess it's (and few places below where these packages are used) accidentally removed?
Contributor
There was a problem hiding this comment.
issue: merge conflict issue? It should be fs I guess
Contributor
💔 Build Failed |
Contributor
Author
|
Thanks @azasypkin, addressed your issues |
Contributor
💚 Build Succeeded |
* Removes event-stream package (and sub-deps) + implements a similar API to what we were using * Removing array_streams in favor of existing utils * Fixing lockfile * Allow report-errors to propogate through (don't catch) * [cli/reloacConfig/test] update test to use promises * avoid mixing async and Promise.then more than necessary
Contributor
💔 Build Failed |
Contributor
|
retest |
Contributor
💚 Build Succeeded |
azasypkin
approved these changes
Dec 6, 2018
Contributor
azasypkin
left a comment
azasypkin
left a comment
There was a problem hiding this comment.
Changes in reload_logging_config.test.js look good to me, thanks!
| expect(exitCode).toEqual(0); | ||
| expect(sawJson).toEqual(true); | ||
| expect(sawNonjson).toEqual(true); | ||
| }, 60000); |
Contributor
There was a problem hiding this comment.
optional nit: there should a minute, but I don't want you to wait another CI run, so I'm fine with backporting this as is.
Contributor
Author
There was a problem hiding this comment.
Coolio, going to merge this!
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Back ports #26205. Had a merge conflict that required a manual resolution, hence the two commits.