-
Notifications
You must be signed in to change notification settings - Fork 1.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
exposing http client for web sockets #46038
exposing http client for web sockets #46038
Conversation
Merge commit 'ee3dca4b9706d0418e7f47dab5a380edd5ae8334' into 'dev'
Merge commit '3f5694c8277ad181fca994e660bf0c7a7169571a' into 'dev'
Merge commit 'b683098fde9611cea472cb081da2cea7ba15bc8b' into 'dev'
Merge commit '53c8eda9672fe1555821bfa51e31f3c57683da1d' into 'dev'
Merge commit '08cb8bebe16b6b6f04eb99742ef8decef73a2f10' into 'dev'
Merge commit '8f2ca0b2482bf6acde1e90aab3745de407d4e51a' into 'dev'
Merge commit 'ce3f671f7ad7480811a6b19bc4b2cf46e2ab4708' into 'dev'
Merge commit '75308fc26b7c08c26029cd143720eb05b5370abc' into 'dev'
Merge commit '14b07bc81cc01d83e6a4f4def49a4d29eea66957' into 'dev'
Merge commit '787d2659c93ac6cb88efa0871f9a275c11925a52' into 'dev'
Merge commit '0ac716d098791ff9a8893f3ffce44a08439e90f2' into 'dev'
Merge commit 'ff14547a20291c68fab49845ab09d2b21e777640' into 'dev'
Merge commit 'bcf06bad4a1d925cc329bb94f1fbaff358a9207b' into 'dev'
Merge commit '927d45d0130ac307e9f0533e795f495aef287085' into 'dev'
Merge commit '3ed83c398d15c3e13f86251e8e5f680ff5b42b79' into 'dev'
Merge commit '73f9d0cd26176f128edcde491644bb911f1178c7' into 'dev'
Merge commit '39550008d664b90fc67271c540cd0daf9127d0f5' into 'dev'
Merge commit '8bd30885885db16776653d30c242b48813ef3462' into 'dev'
Merge commit '14998dfa5a0bd51d03fca8554e17da4f5c772b04' into 'dev'
Merge commit 'ab694d352de30c2a235d8560f7ed86c5e3cd256d' into 'dev'
Merge commit '5b8b55dfdd11c58262d3c5baef9ed7635614f329' into 'dev'
Merge commit '78ca98ac8ef97ca115b2b3f38734cf905917f114' into 'dev'
Merge commit 'f13285482df8f30462410851a6b90f0cb14bb8f3' into 'dev'
Merge commit '3c5767ccd34d0aeaf084bbf50b0849e24c17d710' into 'dev'
Merge commit '31acdc9d92c93742999c8fb92f2c4c051bd1fafe' into 'dev'
Merge commit '45e3d3c77f775a81fb863022555e37fe36d111a7' into 'dev'
Merge commit 'a7e5965495dd60bfe0c6717c416cc133526ca5a3' into 'dev'
Merge commit '11d6203130004d0e3efff70f7873933fb53945b9' into 'dev'
Merge commit 'dc62c9c3c22453277d357cfcc7f9b010840ac5ca' into 'dev'
Merge commit 'd6b79dab6c6401c08ec6bddf5f2beb84198e17dc' into 'dev'
Merge commit '31364331e9ab5d2ec8b033ecd3bdfea8c32289c1' into 'dev'
Merge commit 'a1e0a0e3946abaf8891ddd69d996ff1fab9b891d' into 'dev'
Merge commit '85ca8d64729c276bcdb16b517a50054427eacc54' into 'dev'
Merge commit '823b429d86ef0be534e96b922ad115df42a47d80' into 'dev'
Merge commit 'a4e4659c82ab02297d9c31429bbd404b28d36f7d' into 'dev'
Merge commit '53448def7325b79e22f27438c7e57881ccf897a6' into 'dev'
Merge commit '02a8dd90e11286eb8427a12011c0fbeebe50f50f' into 'dev'
Merge commit '33aa207efd4f51bfa9bf0c355c62a8099a221cf3' into 'dev'
Merge commit '3a3b3e480baf3750ec22e5a482ee5930ad55fb9b' into 'dev'
Merge commit 'a22d5b98fde7e8cf548982a9d683e0ebf350d520' into 'dev'
Merge commit '62d0d5ff4d1a26010382d790c49bbf31a8b6be94' into 'dev'
Merge commit 'c0f6b37d1732e8e468899200caf3ec68886c7bfd' into 'dev'
Merge commit '2f85591b67d12f8bbbaa5ad86ceefadc4c150371' into 'dev'
Merge commit 'f6c91128be6b77aef8351e1e3a9d07c85bc2e46e' into 'dev'
Merge commit '04fb485fd5ca846ee495151cbec64dca2f989525' into 'dev'
Merge commit 'b8a1cd485090a60ac49668dcbe3a7af311e5983c' into 'dev'
Merge commit '245705e23c9ec290b10cbb981c1941d7e600b00c' into 'dev'
Merge commit 'fb90f11f4b20dc244726efdcadd9651d522956eb' into 'dev'
Merge commit '15187a692d9c3140c26d0473b4158108046bc1e5' into 'dev'
Merge commit 'bee609fd6b09d3e122ab279d58d9154a7f5f1263' into 'dev'
Please rebase your commits on master and push again. We can only accept PRs on the master branch. The dev branch is autogenerated. |
@athomas do you mean making the changes from master and pushing to master? |
I mean roughly this (I use
Or alternatively:
Otherwise you can create a new branch tracking master and apply your changes there and open a new PR. |
…t/sdk into exposing_http_client_web_socket
Looks like you attempted to merge from dev to master which doesn't work because the merge will include all the commits on dev that aren't on master (and we don't want those). Let me know if you need help with this and I can try and fix this up. |
Solution for certificate pinning for web sockets.
Solves #34284