Resolves conflict on merge with master #4
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
- Refactored the JSONStream to be a through stream - Closes elastic#2471 - Refactored how we handle JSONStreams. They now need to be piped to the destination
Closes elastic#2992 - Adding name to the list of filter.props
Make scripted field script monospace
Fixing logic for upgrading
Config migration
Closes elastic#2471 - Add logging to a file
adding feature to remove circles when option to remove circles selected
Pretty print object in arrays
Described how to use an ES client node for load balancing. Removed (broken) kibana4_server role example.
…fix/3199 Conflicts: src/kibana/components/vislib/visualizations/line_chart.js
jthomassie
pushed a commit
that referenced
this pull request
Mar 4, 2015
Resolves conflict on merge with master
jthomassie
pushed a commit
that referenced
this pull request
Apr 2, 2015
[settings/advanced] don't override false with the default value
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.
Resolved a conflict in line charts after merging master.