Skip to content

Commit ea10eb5

Browse files
authored
Merge branch 'main' into entitlements/fileaccesstree-fix-windows-casing
2 parents 3894d03 + 75f8e4a commit ea10eb5

File tree

4 files changed

+17
-2
lines changed

4 files changed

+17
-2
lines changed

docs/changelog/126992.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 126992
2+
summary: Add missing `outbound_network` entitlement to x-pack-core
3+
area: Infra/Core
4+
type: bug
5+
issues:
6+
- 127003

muted-tests.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,9 @@ tests:
417417
- class: org.elasticsearch.xpack.test.rest.XPackRestIT
418418
method: test {p0=esql/10_basic/basic with documents_found}
419419
issue: https://github.com/elastic/elasticsearch/issues/127039
420+
- class: org.elasticsearch.xpack.esql.qa.multi_node.EsqlSpecIT
421+
method: test {rerank.Reranker before a limit ASYNC}
422+
issue: https://github.com/elastic/elasticsearch/issues/127051
420423

421424
# Examples:
422425
#

test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1748,8 +1748,12 @@ public static void awaitIndexExists(String index, Client client) {
17481748

17491749
public static void awaitIndexExists(String index, Client client, TimeValue timeout) {
17501750
assertThat("wildcards not supported", index, allOf(not(Metadata.ALL), not(containsString("*"))));
1751-
safeGet(
1752-
client.admin().cluster().prepareHealth(timeout, index).setIndicesOptions(IndicesOptions.LENIENT_EXPAND_OPEN_CLOSED).execute()
1751+
assertNoTimeout(
1752+
client.admin()
1753+
.cluster()
1754+
.prepareHealth(timeout, index)
1755+
.setTimeout(timeout)
1756+
.setIndicesOptions(IndicesOptions.LENIENT_EXPAND_OPEN_CLOSED)
17531757
);
17541758
}
17551759

x-pack/plugin/core/src/main/plugin-metadata/entitlement-policy.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ org.apache.httpcomponents.httpcore.nio:
1717
org.apache.httpcomponents.httpasyncclient:
1818
- manage_threads
1919
unboundid.ldapsdk:
20+
- set_https_connection_properties # TODO: review if we need this once we have proper test coverage
21+
- outbound_network
2022
- manage_threads
2123
- write_system_properties:
2224
properties:

0 commit comments

Comments
 (0)