[do not squash] Network august #13927
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: Abhishek Shah <shabhis@microsoft.com>
Co-authored-by: Sachet Hegde <sahegd@microsoft.com>
#13695) * Added WebCategories * Update ChangeLog.md Co-authored-by: Yunchi Wang <54880216+wyunchi-ms@users.noreply.github.com>
* add firewall policy new commands * SDK * network test project * firewall policy premium test * add UT * finish UT * help files * add nuget package * CR * Updated ApiVersion from 2020-05-01 to 2020-07-01 (#13357) Updated ApiVersion from 2020-05-01 to 2020-07-01 * Added officially published SDK (#13409) * change to new SDK version * Add TranslatedFqdn option for Azure Firewall Policy NAT Rule (#13238) * Add TranslatedFqdn option for Azure Firewall Policy NAT Rule * Fixing LB test * Fixed more LB tests * fixes * fix * fix * Added WebCategories * Premium sets and TLS * Added .md files for changes * Added change log for premiume set changes * changeLog.md from adi * added shouldProcess and fixed variable name * changing -SignatureOverrides to -SignatureOverride * re-record tests and remove FirewallPolicySslCert.pfx as it wasn't needed Co-authored-by: Adi Griever <adgrieve@microsoft.com> Co-authored-by: Ranjani Hatti <57383674+v-shhatt@users.noreply.github.com> Co-authored-by: Mikhail <mikhail.tryakhov@gmail.com> Co-authored-by: tejasshah7 <49326906+tejasshah7@users.noreply.github.com>
* enable p2sMultiAuth * update help files * Update src/Network/Network/ChangeLog.md addressing review comments Co-authored-by: Yeming Liu <felix_liu@outlook.com> Co-authored-by: Yeming Liu <felix_liu@outlook.com>
MikhailTryakhov
requested review from
bilaakpan-ms,
dkulkarni-ms,
grizzlytheodore,
haagha,
madewithsmiles,
MS-syh2qs and
Sandido
as code owners
|
Please resolve the conflicts in csproj files. Thanks |
|
#13929 Can you please help to merge a fix? |
isra-fel
added
the
Do Not Squash 🚫
dingmeng-xue
force-pushed
the
network-august
branch
from
a60e990 to
3df1a75
Compare
[do not squash] sync network-august with master
isra-fel
approved these changes
Jan 12, 2021
This was referenced Jan 12, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Checklist
CONTRIBUTING.mdChangeLog.mdfile(s) has been updated:ChangeLog.mdfile can be found atsrc/{{SERVICE}}/{{SERVICE}}/ChangeLog.md## Upcoming Releaseheader -- no new version header should be added