Commit 07a9e67
committed
Merge origin/main into polyglot/client-v2-ssl-cipher-suites
Resolve conflict in client-v2 HttpAPIClientHelperTest.java by keeping both
test sets: the cipher-suite selection tests (this PR) and the 502/503
ConnectException tests added on main (#2880). Merged/deduplicated imports;
no test weakened. All other files auto-merged (CHANGELOG keeps both entries;
HttpAPIClientHelper.java keeps both the createHttpClient cipher-suite logic
and main's executeRequest 502/503 handling).38 files changed
Lines changed: 914 additions & 1521 deletions
File tree
- .github
- scripts
- test_data
- all_improvements
- baseline
- current
- all_regressions
- baseline
- current
- empty_intersection
- baseline
- current
- mixed
- baseline
- current
- no_alloc
- baseline
- current
- noise_only
- baseline
- current
- only_in_baseline
- baseline
- current
- only_in_pr
- baseline
- current
- workflows
- client-v2/src
- main/java/com/clickhouse/client/api
- data_formats/internal
- internal
- transport
- test/java/com/clickhouse/client
- api
- data_formats/internal
- internal
- transport
- examples/client-v2
This file was deleted.
This file was deleted.
This file was deleted.
Lines changed: 0 additions & 20 deletions
This file was deleted.
Lines changed: 0 additions & 20 deletions
This file was deleted.
Lines changed: 0 additions & 20 deletions
This file was deleted.
Lines changed: 0 additions & 20 deletions
This file was deleted.
Lines changed: 0 additions & 11 deletions
This file was deleted.
Lines changed: 0 additions & 11 deletions
This file was deleted.
Lines changed: 0 additions & 38 deletions
This file was deleted.
0 commit comments