Commit ddbac68
Don't reset upper bounds (elastic#135226)
Transport version upper bounds are currently set to their values from
upstream main whenever no new definition is detected. However, this
is like a partial merge of upstream, and produces broken state files.
This commit temporarily comments out resetting until a more robust
solution is built.1 parent d8582cd commit ddbac68
File tree
2 files changed
+12
-3
lines changed- build-tools-internal/src
- integTest/groovy/org/elasticsearch/gradle/internal/transport
- main/java/org/elasticsearch/gradle/internal/transport
2 files changed
+12
-3
lines changedLines changed: 10 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
90 | 90 | | |
91 | 91 | | |
92 | 92 | | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
93 | 96 | | |
94 | 97 | | |
95 | 98 | | |
| |||
144 | 147 | | |
145 | 148 | | |
146 | 149 | | |
147 | | - | |
| 150 | + | |
148 | 151 | | |
149 | 152 | | |
150 | 153 | | |
| |||
242 | 245 | | |
243 | 246 | | |
244 | 247 | | |
| 248 | + | |
| 249 | + | |
245 | 250 | | |
246 | 251 | | |
| 252 | + | |
247 | 253 | | |
248 | 254 | | |
249 | 255 | | |
| |||
406 | 412 | | |
407 | 413 | | |
408 | 414 | | |
| 415 | + | |
| 416 | + | |
409 | 417 | | |
410 | 418 | | |
411 | 419 | | |
| |||
416 | 424 | | |
417 | 425 | | |
418 | 426 | | |
419 | | - | |
| 427 | + | |
420 | 428 | | |
421 | 429 | | |
422 | 430 | | |
| |||
Lines changed: 2 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
103 | 103 | | |
104 | 104 | | |
105 | 105 | | |
106 | | - | |
| 106 | + | |
| 107 | + | |
107 | 108 | | |
108 | 109 | | |
109 | 110 | | |
| |||
0 commit comments