Nik Everett f2a4e29039 Merge branch 'master' into feature/sql ...

Original commit: elastic/x-pack-elasticsearch@0d4ad7e19a

2017-07-27 09:06:56 -04:00

..

bin/x-pack

Revert unintended changes to syskeygen from elastic/x-pack-elasticsearch#1831 (elastic/x-pack-elasticsearch#2055)

2017-07-21 12:51:25 +10: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

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-27 09:06:56 -04:00

.gitignore

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

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

build.gradle

Sql should run in ci (elastic/x-pack-elasticsearch#2080)

2017-07-25 14:59:50 -04:00