Nik Everett f66e01369a Merge branch 'master' into feature/sql_2 ...

Original commit: elastic/x-pack-elasticsearch@6ba2651f46

2018-02-01 17:21:37 -05:00

..

bin/x-pack

Merge remote-tracking branch 'elastic/master' into feature/sql_2

2018-01-22 16:03:56 -05:00

bwc-snapshot-dummy-projects

Build: Replace references to x-pack-elasticsearch paths with helper methods (elastic/x-pack-elasticsearch#3748)

2018-01-26 21:48:30 -08:00

core

Merge branch 'master' into feature/sql_2

2018-02-01 17:21:37 -05:00

deprecation

Build: Replace references to x-pack-elasticsearch paths with helper methods (elastic/x-pack-elasticsearch#3748)

2018-01-26 21:48:30 -08:00

graph

Build: Replace references to x-pack-elasticsearch paths with helper methods (elastic/x-pack-elasticsearch#3748)

2018-01-26 21:48:30 -08:00

keys

Rename core plugin and transport dirs

2017-02-10 11:02:42 -08:00

logstash

Build: Replace references to x-pack-elasticsearch paths with helper methods (elastic/x-pack-elasticsearch#3748)

2018-01-26 21:48:30 -08:00

ml

Merge changes related to moving persistent tasks to elasticsearch repo into master branch.

2018-02-01 15:31:57 +01:00

monitoring

fix timeout usage in _bulk to timeout from master_timeout (elastic/x-pack-elasticsearch#3796)

2018-01-31 09:13:46 -08:00

security

Merge branch 'master' into feature/sql_2

2018-02-01 17:21:37 -05:00

sql

SQL: Handle rename in core

2018-01-30 12:50:32 -05:00

src/test

Merge remote-tracking branch 'origin/master' into feature/sql_2

2018-01-31 10:49:25 -07:00

upgrade

Build: Replace references to x-pack-elasticsearch paths with helper methods (elastic/x-pack-elasticsearch#3748)

2018-01-26 21:48:30 -08:00

watcher

Watcher: Add support for scheme in proxy configuration (elastic/x-pack-elasticsearch#3614)

2018-01-31 14:12:25 +01:00

build.gradle

Merge remote-tracking branch 'origin/master' into feature/sql_2

2018-01-29 15:42:01 -07:00