Skip to content

Conversation

@anton-evseev
Copy link
Contributor

Description

This is network-may plus resolution of merge conflicts

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)
    • the markdown help files have been regenerated using the commands listed here

aegal and others added 30 commits May 29, 2020 21:05
* lb backend address pool create/update/delete operations

* adding tests with draft

* making some updates for design review PR to powershell team

* adding .md files

* -adding tests
-updating help files
-addressing feedback

* pulling in sdk changes for network-may branch for validation errors

* Addressing comments and updating output format for PsLoadBalancerBackendAddress

* updating .md files and making final changes

Co-authored-by: Ali Egal <alegal@microsoft.com>
…P2SVpnGateway and P2SClients (Azure#12006)

* Adding new optional parameter to specify dns servers for Virtual Wan-P2SVpnGateway and P2SClients

* Incorporate code review comments and added test record

* Suppress warnings

* Suppress cred scan errors
Co-authored-by: Ali Egal <alegal@microsoft.com>
* Network SDK for 2020-05-01

* Fixes for FirewallPolicy

* Recs

* Recs

* SDK package

* Ignore Network API version in Batch tests

* CredScan suppression
* commit1

* commit2

* Fix1

Co-authored-by: Khushboo Baheti <khbaheti@microsoft.com>
…or Multiple DNAT Rule Collections (Azure#12095)

* Change RuleGroup and RuleCollectionGroup based on swagger change. Also,
add support for NAT Rule Collections containing multiple NAT Rule
Collections

* PR Comments

* Updated the SDK

* StaticAnalysis

* Previous changes got removed in rebase
anton-evseev and others added 15 commits June 11, 2020 09:49
* Use Network SDK from NuGet

* Additional mappings
* ti whitelist changes

* build fix

* help files

* added examples for help files

* adding the online version

* recordings done

* changed to markdown files

* fixed statis analysis

* added exception for static analysis

* addressing comments

* updated recordings

* new recordings
* merge conflict

* fixes

* tejas review

Co-authored-by: Ishani Gupta <isgu@microsoft.com>
* Add support for IPGroups in Firewall Policy Rules

* Pr Comments

* Resolved merge conflicts

* Update ChangeLog.md

* Update ChangeLog.md

Co-authored-by: Yabo Hu <yabhu@microsoft.com>
PR : Update to accomdate SDK changes with VNET reference
* Application Gateway Private Link Cmdlets

* add change log
* add routing state and expose reset-hubrouter

* update help

* updated

* Update ChangeLog.md

* update help file name

* export cmdlet

* update test

* fix

* update md file

* update tests

* updated help

* Update Reset-AzHubRouter.md

* test recorded

Co-authored-by: Yabo Hu <yabhu@microsoft.com>
# Conflicts:
#	src/CognitiveServices/CognitiveServices.Test/CognitiveServices.Test.csproj
#	src/CosmosDB/CosmosDB.Test/CosmosDB.Test.csproj
#	src/Monitor/Monitor.Test/Monitor.Test.csproj
#	src/Network/Network/Az.Network.psd1
#	src/Network/Network/ChangeLog.md
#	src/Network/Network/help/Set-AzFirewall.md
#	src/RecoveryServices/RecoveryServices.Backup.Test/RecoveryServices.Backup.Test.csproj
#	src/RecoveryServices/RecoveryServices.SiteRecovery.Test/RecoveryServices.SiteRecovery.Test.csproj
#	src/SqlVirtualMachine/SqlVirtualMachine.Test/SqlVirtualMachine.Test.csproj
#	tools/StaticAnalysis/Exceptions/Az.Network/BreakingChangeIssues.csv
@VeryEarly VeryEarly self-assigned this Jun 16, 2020
@VeryEarly VeryEarly merged commit 4697bbe into Azure:master Jun 16, 2020
@anton-evseev anton-evseev deleted the merge-network-may branch June 16, 2020 06:47
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.