Commit 3be7f2e
committed
Merge branch 'main' of https://github.com/prwhelan/elasticsearch into deepseek
File tree
108 files changed
+4779
-2870
lines changed- docs
- changelog
- reference/query-languages
- gradle
- libs/entitlement
- bridge/src/main/java/org/elasticsearch/entitlement/bridge
- qa
- entitled-plugin/src/main/java/org/elasticsearch/entitlement/qa/entitled
- entitlement-test-plugin
- src/main/java
- org/elasticsearch/entitlement/qa/test
- src/javaRestTest/java/org/elasticsearch/entitlement/qa
- src/main/java/org/elasticsearch/entitlement/runtime
- api
- policy
- modules/repository-azure
- server/src
- main/java/org/elasticsearch
- cluster/metadata
- index/codec/tsdb
- repositories/blobstore
- snapshots
- test/java/org/elasticsearch/cluster/metadata
- test/framework/src/main/java/org/elasticsearch/test/rest
- x-pack
- plugin
- downsample/src/test/java/org/elasticsearch/xpack/downsample
- ent-search/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/xpack/application
- esql-core/src/main/java/org/elasticsearch/xpack/esql/core
- expression
- tree
- esql
- compute/src/main/java/org/elasticsearch/compute/operator
- qa/testFixtures/src/main/resources
- src
- internalClusterTest/java/org/elasticsearch/xpack/esql/action
- main
- antlr
- lexer
- java/org/elasticsearch/xpack/esql
- action
- analysis
- parser
- planner
- mapper
- plan
- logical
- physical
- test/java/org/elasticsearch/xpack/esql
- analysis
- parser
- tree
- inference/src
- main/java/org/elasticsearch/xpack/inference
- external
- action/openai
- http/sender
- openai
- response
- azureaistudio
- mistral
- openai
- services/openai
- completion
- embeddings
- test/java/org/elasticsearch/xpack/inference
- external
- action
- azureopenai
- openai
- http/sender
- openai
- request/elastic
- unified
- services/openai
- logsdb/src
- main/java/org/elasticsearch/xpack/logsdb
- test/java/org/elasticsearch/xpack/logsdb
- ml-package-loader/src/main/java/org/elasticsearch/xpack/ml/packageloader/action
- ql/src/main/java/org/elasticsearch/xpack/ql
- expression
- plan
- tree
- security
- lib
- nimbus-jose-jwt-modified-part1
- nimbus-jose-jwt-modified
- qa/multi-project
- src/javaRestTest/java/org/elasticsearch/xpack/security/authc/jwt
- qa/multi-project
- core-rest-tests-with-multiple-projects
- yaml-test-framework/src/main/java/org/elasticsearch/multiproject/test
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
108 files changed
+4779
-2870
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 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
116 | 116 | | |
117 | 117 | | |
118 | 118 | | |
119 | | - | |
| 119 | + | |
120 | 120 | | |
121 | 121 | | |
122 | 122 | | |
123 | 123 | | |
124 | 124 | | |
125 | | - | |
| 125 | + | |
126 | 126 | | |
127 | 127 | | |
128 | 128 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
984 | 984 | | |
985 | 985 | | |
986 | 986 | | |
987 | | - | |
988 | | - | |
989 | | - | |
| 987 | + | |
| 988 | + | |
| 989 | + | |
990 | 990 | | |
991 | 991 | | |
992 | 992 | | |
| |||
libs/entitlement/bridge/src/main/java/org/elasticsearch/entitlement/bridge/EntitlementChecker.java
Lines changed: 2 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
64 | 64 | | |
65 | 65 | | |
66 | 66 | | |
| 67 | + | |
67 | 68 | | |
68 | 69 | | |
69 | 70 | | |
| |||
1203 | 1204 | | |
1204 | 1205 | | |
1205 | 1206 | | |
1206 | | - | |
| 1207 | + | |
1207 | 1208 | | |
1208 | 1209 | | |
1209 | 1210 | | |
| |||
Lines changed: 9 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
63 | 63 | | |
64 | 64 | | |
65 | 65 | | |
66 | | - | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
67 | 75 | | |
68 | 76 | | |
69 | 77 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| 27 | + | |
27 | 28 | | |
28 | 29 | | |
29 | 30 | | |
| |||
Lines changed: 1 addition & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| 14 | + | |
14 | 15 | | |
15 | 16 | | |
16 | 17 | | |
| |||
0 commit comments