Code

Resolves conflict on merge with master#4

Code

Merged

jthomassie merged 28 commits intojthomassie:fix/3199jthomassie/kibana:fix/3199from stormpython:fix/3199stormpython/kibana:fix/3199Copy head branch name to clipboardMar 4, 2015

+342-89

Commits

Commits on Feb 27, 2015

• adding feature to remove circles when option to remove circles selected

  stormpython

  committed
  01c3c56

  Copy full SHA for 01c3c56

• Closes elastic#2471 - Add logging to a file

  Show description for 5d46991
  simianhacker

  committed
  5d46991

  Copy full SHA for 5d46991

• Closes elastic#2992 - Adding name to the list of filter.props

  simianhacker

  committed
  339b923

  Copy full SHA for 339b923

Commits on Feb 28, 2015

• Make scripted field script monospace

  joehillen

  committed
  ca5d221

  Copy full SHA for ca5d221

Commits on Mar 2, 2015

• Pretty print object in arrays

  Filirom1

  committed
  f45151a

  Copy full SHA for f45151a

• Use @font-family-monospace for scripted-field-script

  joehillen

  committed
  a91d2fd

  Copy full SHA for a91d2fd

• small changes

  stormpython

  committed
  74d80dd

  Copy full SHA for 74d80dd

• adding the ability for circles to be displayed if there is only one point in the data

  stormpython

  committed
  0788e40

  Copy full SHA for 0788e40

• Merge branch 'master' into enhancement/3176

  stormpython

  committed
  a07bd25

  Copy full SHA for a07bd25

• moving the comment

  stormpython

  committed
  e4a138a

  Copy full SHA for e4a138a

• Fixing logic for upgrading

  simianhacker

  committed
  5d3438d

  Copy full SHA for 5d3438d

• Merge pull request elastic#3204 from simianhacker/fix/2992

  Show description for a2bdb09
  lukasolson

  committed
  a2bdb09

  Copy full SHA for a2bdb09

• Adding tests around upgradeConfig

  simianhacker

  committed
  a731c78

  Copy full SHA for a731c78

Commits on Mar 3, 2015

• Adding an upgrade use case

  simianhacker

  committed
  40aec28

  Copy full SHA for 40aec28

• Wrong decription

  simianhacker

  committed
  6f23453

  Copy full SHA for 6f23453

• Merge pull request elastic#3209 from joehillen/scripted-field-monospace

  Show description for 1c4a0c7
  rashidkpc

  committed
  1c4a0c7

  Copy full SHA for 1c4a0c7

• Removing unused promise

  simianhacker

  committed
  386dabe

  Copy full SHA for 386dabe

• Merge pull request elastic#3236 from simianhacker/fix/upgradeConfig

  Show description for 3a73330
  w33ble

  committed
  3a73330

  Copy full SHA for 3a73330

• no need to wrap this in a function

  w33ble

  committed
  341453a

  Copy full SHA for 341453a

• remove some unused Promise

  w33ble

  committed
  58b9368

  Copy full SHA for 58b9368

• Merge pull request elastic#3253 from w33ble/config-migration

  Show description for 689603e
  simianhacker

  committed
  689603e

  Copy full SHA for 689603e

Commits on Mar 4, 2015

• Merge pull request elastic#3201 from simianhacker/fix/2471

  Show description for e0bea02
  w33ble

  committed
  e0bea02

  Copy full SHA for e0bea02

• Merge branch 'master' into enhancement/3176

  stormpython

  committed
  c3db5da

  Copy full SHA for c3db5da

• renaming function for PR review

  stormpython

  committed
  2b2d0f5

  Copy full SHA for 2b2d0f5

• Merge pull request elastic#3197 from stormpython/enhancement/3176

  Show description for cde5f15
  w33ble

  committed
  cde5f15

  Copy full SHA for cde5f15

• Merge pull request elastic#3191 from worldline/patch-1

  Show description for 68f9783
  rashidkpc

  committed
  68f9783

  Copy full SHA for 68f9783

• Added Load Balancing Across Multiple Elasticsearch Nodes section.

  Show description for 2623d24
  debadair

  committed
  2623d24

  Copy full SHA for 2623d24

• Merge branch 'fix/3199' of https://github.com/jthomassie/kibana into fix/3199

  Show description for fcfaf5d
  stormpython

  committed
  fcfaf5d

  Copy full SHA for fcfaf5d