| commit | 129300f796f660ce06d7a86627b6869f742892f0 | [log] [tgz] |
|---|---|---|
| author | David Pursehouse <dpursehouse@collab.net> | Sun Jun 10 13:47:19 2018 +0900 |
| committer | David Pursehouse <dpursehouse@collab.net> | Sun Jun 10 15:47:59 2018 +0900 |
| tree | ddc833ddd54bcd85e8883563b2ceffd4f2b28165 | |
| parent | a288c2e6c0c7bcd9295860bb583089a6a6389cec [diff] | |
| parent | aab6d47e2511060282dd889a4853f7cdf050f09e [diff] |
Merge branch 'stable-2.14' into stable-2.15 * stable-2.14: ElasticReindexIT: Add tests against Elasticsearch version 6 Elasticsearch: Add tests for queries against version 6 Elasticsearch: Add support for V6 / one index type The changes done in I04f275dd9 ("ElasticReindexIT: Add tests against Elasticsearch version 6") are not included in this merge since the reindex tests currently don't work on stable-2.15 (see issue 8799). Change-Id: I1c940f6a95d39710dc7fb8c1cac605fa4c8efac6