Skip to content

[v14] Add non-AD desktops to Enroll New Resource#35797

Merged
probakowski merged 5 commits intobranch/v14from
backport/probakowski/35231-v14
Dec 18, 2023
Merged

[v14] Add non-AD desktops to Enroll New Resource#35797
probakowski merged 5 commits intobranch/v14from
backport/probakowski/35231-v14

Conversation

@probakowski
Copy link
Copy Markdown
Contributor

Backport #35231 to branch/v14

This is manual backport as we need make grpc to update proto generated code.

Changelog: Add non-AD desktops to Enroll New Resource

* Add non-AD to Enroll new resource

* add discoverresource to proto

* reword desktops labels

* Update UI test snapshot

* Update UI test snapshot

* Update web/packages/teleport/src/Discover/SelectResource/resources.tsx

Co-authored-by: Isaiah Becker-Mayer <isaiah@goteleport.com>

* Update web/packages/teleport/src/Discover/SelectResource/resources.tsx

Co-authored-by: Isaiah Becker-Mayer <isaiah@goteleport.com>

* Update UI test snapshot

---------

Co-authored-by: Isaiah Becker-Mayer <isaiah@goteleport.com>
@zmb3 zmb3 changed the title Add non-AD desktops to Enroll New Resource (#35231) [v14] Add non-AD desktops to Enroll New Resource Dec 16, 2023
@public-teleport-github-review-bot public-teleport-github-review-bot Bot removed the request for review from zmb3 December 18, 2023 09:55
@probakowski probakowski added this pull request to the merge queue Dec 18, 2023
Merged via the queue into branch/v14 with commit a70c62b Dec 18, 2023
@probakowski probakowski deleted the backport/probakowski/35231-v14 branch December 18, 2023 18:41
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.

3 participants