Skip to content
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

Fix AddADBAction and DownloadWalletAction in delivery #5389

Merged
merged 1 commit into from
Jan 30, 2023

Conversation

sdedic
Copy link
Member

@sdedic sdedic commented Jan 30, 2023

Following the discussion in #5387, this PR cherry-picks master changes and resolves conflicts so the contents of the conflicted file is the same as in vsnetbeans_1603.

* Use NotifyDescriptor.ComposedInput for Add ADB command
* Fixing steps count, repeat for empty username
@sdedic sdedic added VSCode Extension [ci] enable VSCode Extension tests enterprise [ci] enable enterprise job labels Jan 30, 2023
@sdedic sdedic added this to the NB17 milestone Jan 30, 2023
@sdedic sdedic self-assigned this Jan 30, 2023
Copy link
Member

@neilcsmith-net neilcsmith-net left a comment

Choose a reason for hiding this comment

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

OK, thanks. Merging.

I'm assuming we'll still see a merge conflict in the sync PR. If so, I'll create a new sync PR after the release candidate build and get you to review before merge to master.

@neilcsmith-net neilcsmith-net merged commit 4aa7012 into apache:delivery Jan 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enterprise [ci] enable enterprise job VSCode Extension [ci] enable VSCode Extension tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants