Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  e2e-tests: Add JAVA_OPTS support to the framework
  ElasticV{6,7}QueryChangesTest: Add comment about issue 10120

Change-Id: Ic6e1de59325c26568ca23bcf04d4bd0b4b1b27a5
This commit is contained in:
David Pursehouse
2020-04-03 09:18:20 +09:00
10 changed files with 54 additions and 11 deletions

View File

@@ -57,6 +57,8 @@ public class ElasticV6QueryChangesTest extends AbstractQueryChangesTest {
@After
public void closeIndex() {
// Close the index after each test to prevent exceeding Elasticsearch's
// shard limit (see Issue 10120).
client.execute(
new HttpPost(
String.format(

View File

@@ -57,6 +57,8 @@ public class ElasticV7QueryChangesTest extends AbstractQueryChangesTest {
@After
public void closeIndex() {
// Close the index after each test to prevent exceeding Elasticsearch's
// shard limit (see Issue 10120).
client.execute(
new HttpPost(
String.format(