Nik Everett 9d83eccf27 Merge branch 'feature/sql' of github.com:elastic/x-pack-elasticsearch into feature/sql ...

Original commit: elastic/x-pack-elasticsearch@34d536c5e1

2017-07-05 08:15:11 -04:00

..

bin/x-pack

Use a secure setting for the watcher encryption key (elastic/x-pack-elasticsearch#1831)

2017-06-29 14:58:35 -06: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

Fix some dependency licenses

2017-06-26 11:39:13 -04:00

ml-cpp-snapshot

Build: Switch ml snapshot dependency to a local project (elastic/x-pack-elasticsearch#1559)

2017-05-26 01:15:12 -07:00

src

Merge branch 'master' into feature/sql

2017-07-05 08:14:24 -04:00

.gitignore

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

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

build.gradle

Merge branch 'feature/sql' of github.com:elastic/x-pack-elasticsearch into feature/sql

2017-07-05 08:15:11 -04:00