[Backport to 5.x] remove leading spaces#8520
Merged
thomasneirynck merged 1 commit intoelastic:5.xfrom Oct 3, 2016
Merged
Conversation
Contributor
|
How did you create this? Just by cherry-picking? |
Contributor
Author
|
yes, just cherry-picking |
Contributor
|
@thomasneirynck And it cherry-picked without any conflict? |
Contributor
Author
|
@epixa no conflicts |
Contributor
|
@thomasneirynck Awesome. That can happen - jasper uses a really dumb patch applying mechanism, so it's not uncommon for it to fail on jasper yet apply cleanly locally. |
airow
pushed a commit
to airow/kibana
that referenced
this pull request
Feb 16, 2017
[Backport to 5.x] remove leading spaces Former-commit-id: f815b12
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
2 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.
backport of #8438. This replaces jasper-PR #8441.
I am confused why there was a merge error earlier. This is the exact same change as on Master.