Skip to content

Commit 18f37d2

Browse files
authored
Merge branch 'main' into field-score-missing-field
2 parents bfcf3a2 + 00654c8 commit 18f37d2

File tree

247 files changed

+3508
-1939
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

247 files changed

+3508
-1939
lines changed

distribution/tools/server-cli/src/test/java/org/elasticsearch/server/cli/APMJvmOptionsTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import static org.mockito.Mockito.doReturn;
3939
import static org.mockito.Mockito.mock;
4040

41-
@ESTestCase.WithoutSecurityManager
4241
public class APMJvmOptionsTests extends ESTestCase {
4342

4443
private Path installDir;

distribution/tools/server-cli/src/test/java/org/elasticsearch/server/cli/JvmErgonomicsTests.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import org.elasticsearch.common.util.concurrent.EsExecutors;
1616
import org.elasticsearch.node.NodeRoleSettings;
1717
import org.elasticsearch.test.ESTestCase;
18-
import org.elasticsearch.test.ESTestCase.WithoutSecurityManager;
1918

2019
import java.io.IOException;
2120
import java.util.ArrayList;
@@ -41,7 +40,6 @@
4140
import static org.junit.Assert.assertTrue;
4241
import static org.junit.Assert.fail;
4342

44-
@WithoutSecurityManager
4543
@SuppressFileSystems("*")
4644
public class JvmErgonomicsTests extends ESTestCase {
4745

distribution/tools/server-cli/src/test/java/org/elasticsearch/server/cli/JvmOptionsParserTests.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import org.elasticsearch.core.IOUtils;
1616
import org.elasticsearch.core.Strings;
1717
import org.elasticsearch.test.ESTestCase;
18-
import org.elasticsearch.test.ESTestCase.WithoutSecurityManager;
1918
import org.junit.AfterClass;
2019
import org.junit.BeforeClass;
2120

@@ -43,7 +42,6 @@
4342
import static org.hamcrest.Matchers.hasSize;
4443
import static org.hamcrest.Matchers.not;
4544

46-
@WithoutSecurityManager
4745
@LuceneTestCase.SuppressFileSystems("*")
4846
public class JvmOptionsParserTests extends ESTestCase {
4947

distribution/tools/server-cli/src/test/java/org/elasticsearch/server/cli/MachineDependentHeapTests.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
import org.elasticsearch.common.settings.Settings;
1313
import org.elasticsearch.test.ESTestCase;
14-
import org.elasticsearch.test.ESTestCase.WithoutSecurityManager;
1514
import org.hamcrest.Matcher;
1615

1716
import java.util.Collections;
@@ -21,7 +20,6 @@
2120
import static org.hamcrest.Matchers.empty;
2221

2322
// TODO: rework these tests to mock jvm option finder so they can run with security manager, no forking needed
24-
@WithoutSecurityManager
2523
public class MachineDependentHeapTests extends ESTestCase {
2624

2725
public void testDefaultHeapSize() throws Exception {

docs/changelog/126314.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 126314
2+
summary: Add refresh to synonyms put / delete APIs to wait for synonyms to be accessible and reload analyzers
3+
area: Analysis
4+
type: bug
5+
issues:
6+
- 121441

docs/changelog/126598.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 126598
2+
summary: "ESQL: Retain aggregate when grouping"
3+
area: ES|QL
4+
type: bug
5+
issues:
6+
- 126026

docs/changelog/126641.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 126641
2+
summary: Push more `==`s on text fields to lucene
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

docs/changelog/126783.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 126783
2+
summary: Fix shard size of initializing restored shard
3+
area: Allocation
4+
type: bug
5+
issues:
6+
- 105331

docs/changelog/126935.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 126935
2+
summary: Synonyms API - Add refresh parameter to check synonyms index and reload analyzers
3+
area: Analysis
4+
type: enhancement
5+
issues:
6+
- 121441

docs/changelog/127146.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 127146
2+
summary: Fix sneaky bug in single value query
3+
area: ES|QL
4+
type: bug
5+
issues: []

0 commit comments

Comments
 (0)