Skip to content

Commit 07a9e67

Browse files
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).
2 parents 395a862 + fbe31cd commit 07a9e67

38 files changed

Lines changed: 914 additions & 1521 deletions

.github/scripts/compare-jmh.py

Lines changed: 0 additions & 588 deletions
This file was deleted.

.github/scripts/test_compare_jmh.py

Lines changed: 0 additions & 217 deletions
This file was deleted.

.github/scripts/test_data/README.md

Lines changed: 0 additions & 33 deletions
This file was deleted.

.github/scripts/test_data/all_improvements/baseline/jmh-results-baseline.json

Lines changed: 0 additions & 20 deletions
This file was deleted.

.github/scripts/test_data/all_improvements/current/jmh-results-current.json

Lines changed: 0 additions & 20 deletions
This file was deleted.

.github/scripts/test_data/all_regressions/baseline/jmh-results-baseline.json

Lines changed: 0 additions & 20 deletions
This file was deleted.

.github/scripts/test_data/all_regressions/current/jmh-results-current.json

Lines changed: 0 additions & 20 deletions
This file was deleted.

.github/scripts/test_data/empty_intersection/baseline/jmh-results-baseline.json

Lines changed: 0 additions & 11 deletions
This file was deleted.

.github/scripts/test_data/empty_intersection/current/jmh-results-current.json

Lines changed: 0 additions & 11 deletions
This file was deleted.

.github/scripts/test_data/mixed/baseline/jmh-results-baseline.json

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)