Commit ad15e5c
committed
Merge branch '6.0' into 6.1
* 6.0:
[6.0] cs fixes
[5.4] cs fixes
[5.3] cs fixes
[Cache] Fix saving items with no expiration through ProxyAdapter
CS fixes
fix merge
Remove pointless assignment
[HttpClient] Fix tracing requests made after calling withOptions()
[Cache] disable lock on CLI
Revert "feature #41989 [Cache] make `LockRegistry` use semaphores when possible (nicolas-grekas)"
[HttpKernel] fix how configuring log-level and status-code by exception works
[VarDumper] add more "transient-on-macos" groups2 files changed
+2
-5
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
425 | 425 | | |
426 | 426 | | |
427 | 427 | | |
428 | | - | |
429 | | - | |
430 | | - | |
431 | 428 | | |
432 | 429 | | |
433 | 430 | | |
| |||
| 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 | 44 | | |
45 | 45 | | |
| |||
0 commit comments