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 conflicts #16283

Merged
merged 7 commits into from
Oct 29, 2021
Merged

Fix conflicts #16283

merged 7 commits into from
Oct 29, 2021

Conversation

BethanyZhou
Copy link
Contributor

Description

Checklist

  • I have read the Submitting Changes section of CONTRIBUTING.md
  • The title of the PR is clear and informative
  • The appropriate ChangeLog.md file(s) has been updated:
    • For any service, the ChangeLog.md file can be found at src/{{SERVICE}}/{{SERVICE}}/ChangeLog.md
    • A snippet outlining the change(s) made in the PR should be written under the ## Upcoming Release header -- no new version header should be added
  • The PR does not introduce breaking changes
  • If applicable, the changes made in the PR have proper test coverage
  • For public API changes to cmdlets:
    • a cmdlet design review was approved for the changes in this repository (Microsoft internal only)
      • {Please put the link here}
    • the markdown help files have been regenerated using the commands listed here

wyunchi-ms and others added 7 commits October 26, 2021 15:51
…le (#16237)

* Add Wildcard helper

* Fix wildcard filtering in Get-AzSqlServerFirewallRule

* Update src/Sql/Sql/ChangeLog.md

Co-authored-by: Beisi Zhou <[email protected]>
* Update Invoke-AzVMRunCommand.md

#15704

* Update Invoke-AzVMRunCommand.md

* Update Invoke-AzVMRunCommand.md

* Update Invoke-AzVMRunCommand.md

* Update Invoke-AzVMRunCommand.md

* Update Invoke-AzVMRunCommand.md

* Update Invoke-AzVMRunCommand.md

* Update Invoke-AzVMRunCommand.md

* Update Invoke-AzVMRunCommand.md

Co-authored-by: Yunchi Wang <[email protected]>
Co-authored-by: Beisi Zhou <[email protected]>
…th (#16269)

-update change log

-add example for specifying multi-level folder path

-update FolderName to FolderPath as PowerShell Team suggested

-update foldername description in help doc

-resolve some comments in code review

-update change log

-add new parameter foldername
@BethanyZhou BethanyZhou merged commit 4493fc2 into bez/release Oct 29, 2021
@BethanyZhou BethanyZhou deleted the bez/fix branch November 25, 2021 08:02
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.

7 participants