Nik Everett 02cc23cf21 Merge branch 'master' into feature/sql ...

Original commit: elastic/x-pack-elasticsearch@aaad327bd0

2017-08-15 13:05:24 -04:00

..

bin/x-pack

Rename CONF_DIR to ES_PATH_CONF

2017-08-15 06:19:39 +09:00

bwc

Remove assemble from build task when assemble removed

2017-06-16 17:19:47 -04:00

config/x-pack

Rename core plugin and transport dirs

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

keys

Rename core plugin and transport dirs

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

licenses

Merge branch 'master' into feature/sql

2017-07-24 15:04:59 -04:00

ml-cpp-snapshot

[ML] Do not download the ml-cpp zip when building it locally (elastic/x-pack-elasticsearch#2262)

2017-08-15 16:31:23 +01:00

src

Merge branch 'master' into feature/sql

2017-08-15 13:05:24 -04:00

.gitignore

Remove QueryParseContext (elastic/x-pack-elasticsearch#1895)

2017-07-03 17:31:18 +02:00

build.gradle

Merge branch 'master' into feature/sql

2017-07-28 12:06:32 -04:00