| commit | d2b75dec6aab2263ef930a02b135fa60a05bb1a1 | [log] [tgz] |
|---|---|---|
| author | David Pursehouse <dpursehouse@collab.net> | Fri Apr 03 09:18:20 2020 +0900 |
| committer | David Pursehouse <dpursehouse@collab.net> | Fri Apr 03 09:18:59 2020 +0900 |
| tree | 79566e84df4eb5bb558c90cf45b5701cd266523c | |
| parent | 85f9e89d8c5e1247261cd59c32c8da40293189f2 [diff] | |
| parent | 9d5ccafb294eb3b863585bff2f2fb928c8d17934 [diff] |
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
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryChangesTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryChangesTest.java index e840fb9..68c4b71 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryChangesTest.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryChangesTest.java
@@ -57,6 +57,8 @@ @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(
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java index 0cfdbfc..b61bc72 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java
@@ -57,6 +57,8 @@ @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(