Skip to content

[v15] Add support for storing RDP licenses from Windows Desktops#51686

Merged
probakowski merged 12 commits intobranch/v15from
zmb3/v15-backport-51250
Feb 13, 2025
Merged

[v15] Add support for storing RDP licenses from Windows Desktops#51686
probakowski merged 12 commits intobranch/v15from
zmb3/v15-backport-51250

Conversation

@zmb3
Copy link
Copy Markdown
Collaborator

@zmb3 zmb3 commented Jan 30, 2025

Backports #51250

Changelog: Add support for caching Microsoft Remote Desktop Services licenses

Co-authored-by: Alan Parra <alan.parra@goteleport.com>
Signed-off-by: Zac Bergquist <zac.bergquist@goteleport.com>
@zmb3
Copy link
Copy Markdown
Collaborator Author

zmb3 commented Jan 30, 2025

Note: this was the only backport that had conflicts - would appreciate an extra close review.

@codingllama
Copy link
Copy Markdown
Contributor

Note: this was the only backport that had conflicts - would appreciate an extra close review.

Any files or block we should particularly pay attention to?

Copy link
Copy Markdown
Contributor

@codingllama codingllama left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, I didn't spot anything too different from the other PRs.

Looks like you have build failures?

@zmb3
Copy link
Copy Markdown
Collaborator Author

zmb3 commented Jan 31, 2025

Looks like v15 would need to bump the Rust version in order for this to build.

@probakowski probakowski force-pushed the zmb3/v15-backport-51250 branch from e7f9ea5 to 7021faf Compare February 10, 2025 18:11
Comment thread lib/srv/desktop/rdp/rdpclient/.tmpDdVeH5 Outdated
@codingllama
Copy link
Copy Markdown
Contributor

It looks like this grew significantly from the original backport, would it make sense to do the dependency updates on a separate PR?

Similarly, should we rebase onto the recent branch/v15 so we pull Rust upgrade and other fixes.

@probakowski probakowski changed the base branch from branch/v15 to probakowski/v15-ironrdp February 12, 2025 17:03
@probakowski
Copy link
Copy Markdown
Contributor

@codingllama it makes sense to split it, I've created #52081 and rebased/retargeted this PR

Base automatically changed from probakowski/v15-ironrdp to branch/v15 February 13, 2025 18:40
@probakowski probakowski added this pull request to the merge queue Feb 13, 2025
Merged via the queue into branch/v15 with commit 2c34ea6 Feb 13, 2025
@probakowski probakowski deleted the zmb3/v15-backport-51250 branch February 13, 2025 19:24
This was referenced Feb 13, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants