Commit c90a4f6
[8.19] Fix MergeWithLowDiskSpaceIT testRelocationWhileForceMerging (#132913)
* There must be at least one merge task blocked (#132496)
After triggering a force merge, there might still be other merge tasks
running concurrently, so it is incorrect to assert a single merge is
blocked in the test.
Fix #131789
Co-authored-by: Patrick Doyle <[email protected]>
* Use consistent terminology for transport version resources/references (#132882) (#132898)
The build system for transport versions operate on two different types
of projects. A project can have named references to transport versions,
and it could also be the source of truth for transport version resources,
where latest and definitions files exist. This commit renames the
plugins and tasks to consistently use that terminology.
---------
Co-authored-by: Patrick Doyle <[email protected]>
Co-authored-by: Ryan Ernst <[email protected]>1 parent 231656b commit c90a4f6
File tree
1 file changed
+4
-2
lines changed- server/src/internalClusterTest/java/org/elasticsearch/index/engine
1 file changed
+4
-2
lines changedLines changed: 4 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
179 | 179 | | |
180 | 180 | | |
181 | 181 | | |
| 182 | + | |
182 | 183 | | |
183 | 184 | | |
184 | 185 | | |
| |||
254 | 255 | | |
255 | 256 | | |
256 | 257 | | |
| 258 | + | |
257 | 259 | | |
258 | 260 | | |
259 | 261 | | |
| |||
287 | 289 | | |
288 | 290 | | |
289 | 291 | | |
290 | | - | |
291 | | - | |
| 292 | + | |
| 293 | + | |
292 | 294 | | |
293 | 295 | | |
294 | 296 | | |
| |||
0 commit comments