Skip to content

merge main into dev#101

Merged
jbjordan merged 13 commits into
masterfrom
rebase-dev
May 21, 2026
Merged

merge main into dev#101
jbjordan merged 13 commits into
masterfrom
rebase-dev

Conversation

@jbjordan
Copy link
Copy Markdown
Contributor

all tests pass locally

bainian12345 and others added 13 commits May 6, 2020 07:57
Co-authored-by: bailiu <bailiu@microsoft.com>
* make status description for HTTP response be JSON safe

* assert response description

Co-authored-by: bailiu <bailiu@microsoft.com>
Co-authored-by: bailiu <bailiu@microsoft.com>
* cleanup unnecessary pom configurations

* Enable authentication using Azure Identity

* add copyright headers

Co-authored-by: bailiu <bailiu@microsoft.com>
Co-authored-by: bailiu <bailiu@microsoft.com>
Co-authored-by: bailiu <bailiu@microsoft.com>
* text write/read support for websockets

* uri encode request path

* Merge state Add more commits by pushing to the fix/write-read-text branch on
giventocode/azure-relay-java.Revert "uri encode request path"

This reverts commit ee855e0. Review required At least 1 approving review
is required by reviewers with write access. # Please enter the commit message for your changes. Lines
starting All checks have passed# with '#' will be ignored, and an empty message aborts the commit. 1
successful check# @microsoft-cla# On branch fix/write-read-text license/cla — All CLA requirements met.#
Your branch is up to date with 'origin/fix/write-read-text'. Required# Details# Changes to be committed:
Merging is blocked# modified: src/main/java/com/microsoft/azure/relay/HybridHttpConnection.java Merging can
be performed automatically with 1 approving review.# modified:
src/test/java/com/microsoft/azure/relay/HybridConnectionListenerTest.java @giventocode#
 #
 #
Leave a comment No file chosen Attach files by dragging & dropping, selecting or pasting them. Remember,
contributions to this repository should follow its code of conduct.
 ProTip! Add .patch or .diff to the end of URLs for Git’s plaintext views. Reviewers No reviews Still in
progress? Assignees No one assigned Labels None yet

* added large message test, pr feedback

* import fixes, and nit

* import fix
* encode requests url paths

* PR feedback

Co-authored-by: Bainian Liu <bainian12345@hotmail.com>
* .env, logging, and updated dependencies

* replace javax.websockets with jetty websockets
* .env, logging, and updated dependencies

* replace javax.websockets with jetty websockets

* implement ping

* update interval and fix spacing

* fix whitespace

* formatting

* make ping interval configurable and add test
@jbjordan jbjordan merged commit da09938 into master May 21, 2026
1 check passed
@jbjordan jbjordan deleted the rebase-dev branch May 21, 2026 21:35
@jbjordan jbjordan restored the rebase-dev branch May 21, 2026 21:48
jbjordan added a commit that referenced this pull request May 21, 2026
@jbjordan jbjordan deleted the rebase-dev branch May 21, 2026 21:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants