Commit e28b781
committed
Merge remote-tracking branch 'upstream/main' into index-pipeline-tracking
* upstream/main: (33 commits)
Allow both WithEntitlementsOnTestCode and EntitledTestPackages together (elastic#130826)
Move streams status actions to cluster:monitor group (elastic#131015)
Update JDK base image for OIDC fixture (elastic#131176)
Mute org.elasticsearch.xpack.esql.ccq.MultiClustersIT testLookupJoinAliases elastic#131166
Mute org.elasticsearch.index.engine.ThreadPoolMergeExecutorServiceDiskSpaceTests testEnqueuedMergeTasksAreUnblockedWhenEstimatedMergeSizeChanges elastic#131165
Mute org.elasticsearch.xpack.esql.ccq.MultiClustersIT testNotLikeListKeyword elastic#131155
Mute org.elasticsearch.xpack.esql.qa.multi_node.GenerativeIT test elastic#131154
Check file entitlements on the Lucene FilterFileSystem in tests (elastic#130825)
Mute org.elasticsearch.xpack.esql.qa.multi_node.EsqlSpecIT test {lookup-join.MvJoinKeyOnFromAfterStats ASYNC} elastic#131148
Move FrequencyCappedAction to common package (elastic#131060)
Mute org.elasticsearch.xpack.esql.action.CrossClusterAsyncQueryStopIT testStopQueryLocal elastic#121672
Remove nesting from multi allocation decision (elastic#130844)
Disable async search rest tests in release builds (elastic#131132)
Fix testStopQueryLocal (elastic#131130)
Fixes based on resharding disruption tests (elastic#130870)
Remove inactive logger (elastic#131121)
Add wait for remote start for the test (elastic#131124)
Add existing shards allocator settings to failure store allowed list. (elastic#131056)
Don't allow field caps to use semantic queries as index filters (elastic#131111)
issue should be already fixed by elastic#121466 (elastic#130860)
...File tree
153 files changed
+1473
-554
lines changed- docs
- changelog
- reference/query-languages
- esql
- query-dsl
- release-notes
- libs/entitlement/src
- main/java/org/elasticsearch/entitlement
- bootstrap
- runtime/policy
- test/java/org/elasticsearch/entitlement/runtime/policy
- modules/streams/src/main/java/org/elasticsearch/rest/streams/logs
- rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test
- search.vectors
- synonyms
- server/src
- main
- java
- org/elasticsearch
- action/fieldcaps
- cluster
- metadata
- routing
- allocation
- allocator
- decider
- common
- util/concurrent
- index/mapper/vectors
- indices/cluster
- search
- synonyms
- threadpool
- resources/META-INF/services
- test/java/org/elasticsearch
- cluster/metadata
- common
- util/concurrent
- test/framework/src
- main/java/org/elasticsearch
- entitlement
- bootstrap
- runtime/policy
- test
- test/java/org/elasticsearch/entitlement/runtime/policy
- x-pack
- plugin
- async-search
- src/internalClusterTest/java/org/elasticsearch/xpack/search
- blob-cache/src
- esql
- compute
- gen/src/main/java/org/elasticsearch/compute/gen
- src
- main
- generated/org/elasticsearch/compute/aggregation
- spatial
- java/org/elasticsearch/compute/aggregation
- test/java/org/elasticsearch/compute/aggregation
- qa
- server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node
- testFixtures/src/main/resources
- src/internalClusterTest/java/org/elasticsearch/xpack/esql/action
- inference
- qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/xpack/application
- src
- main/java/org/elasticsearch/xpack/inference/services/cohere/request
- v1
- v2
- test/java/org/elasticsearch
- action/fieldcaps
- xpack/inference/services/cohere
- action
- request/v2
- response
- security
- qa/operator-privileges-tests/src/javaRestTest/java/org/elasticsearch/xpack/security/operator
- src/test/java/org/elasticsearch/xpack/ssl
- test/idp-fixture/src/main/resources/oidc
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
153 files changed
+1473
-554
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
250 | 250 | | |
251 | 251 | | |
252 | 252 | | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
16 | | - | |
17 | | - | |
| 16 | + | |
| 17 | + | |
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| |||
Lines changed: 0 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
165 | 165 | | |
166 | 166 | | |
167 | 167 | | |
168 | | - | |
169 | 168 | | |
170 | 169 | | |
171 | 170 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
11 | | - | |
| 11 | + | |
12 | 12 | | |
13 | 13 | | |
14 | | - | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
15 | 24 | | |
16 | 25 | | |
17 | 26 | | |
| |||
40 | 49 | | |
41 | 50 | | |
42 | 51 | | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
161 | 161 | | |
162 | 162 | | |
163 | 163 | | |
164 | | - | |
| 164 | + | |
165 | 165 | | |
166 | 166 | | |
167 | 167 | | |
| |||
170 | 170 | | |
171 | 171 | | |
172 | 172 | | |
173 | | - | |
| 173 | + | |
174 | 174 | | |
175 | 175 | | |
176 | 176 | | |
| |||
0 commit comments