Resolved conflicts #15405
Merged
Resolved conflicts #15405
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
Solutions is getting deprecated, adding note for alternate commands.
Removed extra space in weekly recurring example that was throwing off a copy/paste
* [DataFactroy] Updated ADF .Net SDK version to 4.20.0 * update
Missing new line
…pace (#15377) * Add parameter ManagedSourceGroupName for command New-AzSynapseWorkspace * Update ChangeLog.md
In example 1 and 2, the command missed an "I" in the word Item.
Update deployment (external VNET) -- Location parameter is creating an error The location parameter was creating an issue when I tried to integrate my APIM with Internal Vnet> I had the following error: New-AzApiManagementVirtualNetwork: A parameter cannot be foundthat matches parameter name 'Location'. However, removing the -Location parameter worked for me.
* [Cognitive Services] Upgrade to 2021-04-30 * modify change log * Add breaking change supress
Co-authored-by: wyunchi-ms <[email protected]>
BethanyZhou
requested review from
dkulkarni-ms,
grizzlytheodore,
haagha,
madewithsmiles,
MS-syh2qs and
Sandido
as code owners
dingmeng-xue
approved these changes
Jul 2, 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
Merge release-2021-07-06 branch back to main
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