Commit 9d40715
committed
Merge branch 'master' into verify-official-plugin-signature
* master:
Update the version checks around ip_range bucket keys, now that the change was backported.
Mute IndexMasterFailoverIT.testMasterFailoverDuringIndexingWithMappingChanges
Use geohash cell instead of just a corner in geo_bounding_box (elastic#30698)
Limit user to single concurrent auth per realm (elastic#30794)
[Tests] Move templated _rank_eval tests (elastic#30679)
Security: fix dynamic mapping updates with aliases (elastic#30787)
Ensure that ip_range aggregations always return bucket keys. (elastic#30701)
Use remote client in TransportFieldCapsAction (elastic#30838)
Move Watcher versioning setting to meta field (elastic#30832)
[Docs] Explain incomplete dates in range queries (elastic#30689)
Move persistent task registrations to core (elastic#30755)
Decouple ClusterStateTaskListener & ClusterApplier (elastic#30809)
Send client headers from TransportClient (elastic#30803)
Packaging: Ensure upgrade_is_oss flag file is always deleted (elastic#30732)
Force stable file modes for built packages (elastic#30823)
[DOCS] Fixes typos in security settings
Fix GeoShapeQueryBuilder serialization after backportFile tree
67 files changed
+1460
-715
lines changed- buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant
- distribution
- packages
- docs/reference
- aggregations/bucket
- migration/migrate_7_0
- query-dsl
- qa/smoke-test-rank-eval-with-mustache
- src/test
- java/org/elasticsearch/index/rankeval
- resources/rest-api-spec/test/rank-eval
- rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation
- server/src
- main/java/org/elasticsearch
- action/fieldcaps
- client/transport
- cluster
- service
- common
- cache
- geo
- util/concurrent
- discovery
- single
- zen
- index/query
- persistent
- search/aggregations/bucket/range
- transport
- test/java/org/elasticsearch
- action/support/master
- client
- transport
- cluster/service
- common
- cache
- util/concurrent
- discovery
- single
- zen
- index
- query
- search/geo
- indices/store
- persistent
- search/aggregations/bucket
- range
- test/framework/src/main/java/org/elasticsearch/test
- x-pack
- docs/en/settings
- plugin
- core/src/main
- java/org/elasticsearch/xpack/core
- resources
- security/src
- main/java/org/elasticsearch/xpack/security
- authc
- esnative
- file
- ldap
- support
- authz
- test/java/org/elasticsearch/xpack/security
- action/user
- authc
- esnative
- file
- support
- mapper
- authz
- src/test/resources/rest-api-spec/test/security/authz
- watcher/src/main/java/org/elasticsearch/xpack/watcher
- qa/ml-native-tests/src/test/java/org/elasticsearch/xpack/ml/integration
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
67 files changed
+1460
-715
lines changedLines changed: 4 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| 14 | + | |
14 | 15 | | |
15 | 16 | | |
16 | 17 | | |
| |||
285 | 286 | | |
286 | 287 | | |
287 | 288 | | |
| 289 | + | |
| 290 | + | |
| 291 | + | |
288 | 292 | | |
289 | | - | |
290 | 293 | | |
291 | 294 | | |
292 | 295 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
244 | 244 | | |
245 | 245 | | |
246 | 246 | | |
| 247 | + | |
| 248 | + | |
247 | 249 | | |
248 | 250 | | |
249 | 251 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
122 | 122 | | |
123 | 123 | | |
124 | 124 | | |
| 125 | + | |
125 | 126 | | |
126 | 127 | | |
127 | 128 | | |
| |||
133 | 134 | | |
134 | 135 | | |
135 | 136 | | |
| 137 | + | |
136 | 138 | | |
137 | 139 | | |
138 | 140 | | |
| |||
144 | 146 | | |
145 | 147 | | |
146 | 148 | | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
147 | 154 | | |
148 | 155 | | |
149 | 156 | | |
| |||
162 | 169 | | |
163 | 170 | | |
164 | 171 | | |
| 172 | + | |
165 | 173 | | |
166 | 174 | | |
167 | 175 | | |
| |||
189 | 197 | | |
190 | 198 | | |
191 | 199 | | |
| 200 | + | |
192 | 201 | | |
193 | 202 | | |
194 | 203 | | |
195 | 204 | | |
| 205 | + | |
196 | 206 | | |
197 | 207 | | |
198 | 208 | | |
199 | 209 | | |
| 210 | + | |
200 | 211 | | |
201 | 212 | | |
202 | 213 | | |
| |||
Lines changed: 2 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
| 40 | + | |
40 | 41 | | |
41 | 42 | | |
42 | 43 | | |
43 | 44 | | |
| 45 | + | |
44 | 46 | | |
45 | 47 | | |
46 | 48 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
15 | 18 | | |
16 | 19 | | |
17 | 20 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
231 | 231 | | |
232 | 232 | | |
233 | 233 | | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
234 | 266 | | |
235 | 267 | | |
236 | 268 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
109 | 109 | | |
110 | 110 | | |
111 | 111 | | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
112 | 118 | | |
113 | 119 | | |
114 | 120 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
34 | | - | |
35 | | - | |
36 | | - | |
Lines changed: 0 additions & 159 deletions
This file was deleted.
0 commit comments