Resolving conflicts with main branch on feature branch Cognitive languages may ga #19171
Conversation
This file contains 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
* availability is immutable * Update readme.md Co-authored-by: Yuchao Yan <yuchaoyan@microsoft.com>
* update cpim readme.python.md * Update readme.python.md * Update readme.python.md Co-authored-by: ZiWei Chen (WICRESOFT NORTH AMERICA LTD) <v-ziweichen@microsoft.com>
* Update swagger/documentation * rename version directories * Add descriptions to enums * clean up typo and unnecessary error response descriptions. * add parameter locations * update quoting * share security * improve operation ids * fix swagger by adding missing schema element * fix security * share schema * fix operation id of health status * REvert operation id changes to be less breaking for existing versions * even less breaking changes
…ngs API for 2021-11-01-preview (Azure#18498)
* add link connection input file under current tag * add new tag for artifacts package
Azure#18541) Publishes the 2022-03-01-preview version of Cognitive Services – Language pillar including Text Analytics and Conversation Analysis.
* Adding properties to DC patch * Adding missing status code to swagger * Update example * Adding location header to example
* Add blockchain to latest profile * Add additional types * Renamed 'eTag' to 'etag' same as all other ARM resources * rename 'eTag' to 'etag' Co-authored-by: Mark Cowlishaw <markcowl@microsoft.com>
* Add OutlookChannel to channelNames * revert the change in stable version
…vice (Azure#18037) * add multidimentional RCA API * update to 4 tab * update swagger * update swagger with kind * update * update wording * add derived decoration * update schema definition * add more polymorphism * update create dataset * add kin for train, inference, data * update * update * update * update according to review * update query filter * remove nextLinkName * add error code * update * update verion so v1.2-preview * update spelling * update list partition meta * update * update version * update partition * update * update * merge with 1.1-preview.1 version * update * sync with 1.1-preview.1 * update train response * update inference * update version * update description of timestamp * update * update readme * update * update version * update * add x-ms-error-code * update filter description * add 201 response and add kind list * update * update * update comment * update * update * update * upate * format * add emtpy line at end of file * add dataset Id in required for dataset * update * update
…1 15 preview (Azure#17516) * Defining the APIs for the new NSP resource * created new branch for 2022-01-15-preview * updated api-version in all file from 2022-01-01-preview to 2022-01-15-preview * updates examples for extension types * updates to extension types spec * updated the readme files * updated tags in readme * adding definitions and parameters under common dir * fixing schema issues * fixing schema issue with extension type list * remove versions from x-ms-pageable in extension type versions * suppress top level resources list by subscription for extension types * copying files from appropriate GA versions to new extnesion type versions folder * updating the API version * updating operations list * Revert "copying files from appropriate GA versions to new extnesion type versions folder" This reverts commit 2247056. * adding namespace scope settings to extension types return data * updating location extension types list example * adding latest changes from the previous released version * removing namespace scope settings property * Revert "removing namespace scope settings property" reverting to previous commit tttt reverts commit 00900af. Reverting to previous commit. * adding "x-ms-identifiers" * removing namespace scope settings * adding x-ms-identifiers * adding x-ms-identifiers * ran preittier fix on parameters.json file * updating tag in readme.md * reverting tag update change from last commit * removing uneeded files * fix for api readiness check * Removing all unrelated example files * Revert "Removing all unrelated example files" This reverts commit 6391df3. * Removing all unrelated example files from 2022-01-15 folder * fixing spelling error * quick change Co-authored-by: Hari Prasad Perabattula <harics24@users.noreply.github.com> Co-authored-by: Hari Prasad Perabattula <haperaba@microsoft.com> Co-authored-by: Deeksha Sharma <deesharma@microsoft.com>
* Update example grafanaVersion and endpoint * update endpoint
Co-authored-by: Ashok Chhilar <aschhila@microsoft.com>
…ure#18613) * [AutoSync] 35fcc2afb Merged PR 5921627: fix(cve): Upgrade tanzu component image * revert 0501 * fix Co-authored-by: swagger-automation <swagger@microsoft.com> Co-authored-by: Xuyang Cao <xuycao@microsoft.com>
* Adding 2021-12-01-preview as a copy of 2021-08-01 * Readme update * Updating version in the 2021-12-01-preview folder * update description for keyvault contract (Azure#17150) Co-authored-by: Kacie Kang <jikang@microsoft.com> * fix for the last cherry pick (06d2de8) * fixing readme again * APIM Policy fragments (Azure#16403) * Adding the policy fragments spec * Formatting * Updating descriptions * PolicyFragmentIdParameter as a string * ID validation * Adding fragment description * Adding policy fragment format * Adding raw xml format * Addinga 202 response for creating/updating * Generalising the resource collection * formatting * Moving everything to 2021-12-01 * version fix * Adding pagination params. Generalising the IdParam * Adding missing fields, fixing id param name * Removing link formats. Fixing format param name * POST list references * name filter now supports "contains" * PUT is always async * Fixing header location url * PUT can now return 200 and 201 * Adding more OData query support. Fixing examples. * Resolving the cross breaking change Co-authored-by: Milan Zolota <mizolota@microsoft.com> * Added CORS and CSP configuration resources (Azure#16822) * Added CORS and CSP settings resources. * Added missing definitions. * Added suppression of R4009 for apimportalsettings.json. * Ran Prettier. * Renamed definitions. * Fixed references. * Updated examples. * Reversed change. * Created new resource for portal settings. * Added list example. * Added missing collection contract. * Added missing example. Cleaned up old ones. * Fixed references. * Fixed examples * Fixed version. * Added custom words. Fixed linting. * Fixes. * Fixes. * Fixes. * Fixes. * Fixes. * Fixes. * Fixes. * Fixes. * Fixes. * Fixes. * Fixes * Fixes. * Fixes. * Fixes * Fixes * Removed conflicting constraint. * Updated readme.go.md. * Reverted removing the restriction. * Revert "Reverted removing the restriction." This reverts commit 72d070f. * Removed duplicate. * Addressing PR comments. * Adjusted reportUri property type in CSP config contract. (Azure#17947) * Added missing body parameter description for content type resource. (Azure#18036) * Igo/msal client version (Azure#17866) * Added clientLibrary property to IdentityProvider * fixed length for clientLibrary property * Model validation fixes * moved changes for clientLibrary property to the right spec file * Update readme.md Co-authored-by: Milan Zolota <mizolota@microsoft.com> Co-authored-by: Kacie <35987382+KacieKK@users.noreply.github.com> Co-authored-by: Kacie Kang <jikang@microsoft.com> Co-authored-by: Alexander Zaslonov <zaslonov.alexander@gmail.com> Co-authored-by: Igor O <ygrik@hotmail.com> Co-authored-by: Yuchao Yan <yuchaoyan@microsoft.com>
* Added x-ms-identifier for s360 linting issue * removed from main * Removed enum from ApiVersionParameter
* sync signalr test scenarios * remove extra template.json * add asc scenarios file * add uploadJar scripts * add uploadJar * add deploymentScripts * update readme * update doc and use blob sas url to download * delete unused powershell file and format scripts * adjust asc scenarios file * update springCloud test scenario * update powershell scripts * v2 schema * fix * prettier * securestring * fix action * fix * fit 2.9.0, waiting for verify * fix domainName * json to yaml * fix output variable type * remove redundent defaultValue in armTemplate * generate uniq name * Adapt to v1.1 schema * remove unnecesary file * fix patch step * update springCloud test scenario * update spring cloud yaml * prettier * add overwrite variable * new schema * delete unused file * rename armTemplateDeployment to armTemplate * webpubsub * v1.2 schema * v1.2 schema * webpubsub * v1.2 schema * adapt asc/signalr to v1.2 schema * more data types in v1.2 schema * v1.2 schema * convert to new syntax * restore example * tiny change * refine variables schema * fix scenarios * fix scenarios * signalr basic crud * cdn scenario coverage 57% * add responses schema * use readmeTag insteadof swagger * fix rp * fix schema * fix step scope variables * fix step variables * fix * [ApiScenario] update doc (Azure#18424) * update doc * Update documentation/api-scenario/how-to/generateABasicApiScenario.md Co-authored-by: Tianxiang Chen <tianxchen@microsoft.com> Co-authored-by: Lei Ni <7233663+leni-msft@users.noreply.github.com> * update docs * fix schema * Update variables.md * commit scenario files * remove scenario files * update schema line * remove resourceUpdate * remove resourceUpdate * requestUpdate convention * convention in pseudo-code Co-authored-by: Zhenglai Zhang <zhenglaizhang@hotmail.com> Co-authored-by: Songbo Wang <sonwan@microsoft.com> Co-authored-by: ruowan <ruowan@microsoft.com> Co-authored-by: Tianxiang Chen <tianxchen@microsoft.com> Co-authored-by: tianxchen-ms <403562789@qq.com>
* Update readme.md * Update readme.md * Update readme.md
* add API version 2022-05-01 * fix readme
* Add dapr AppInsights connection string * Remove the deprecation note for now
* copy 0.3-preview.0 as base for 0.3-preview.1 * update api-version to 0.3-preview.1 * Update readme.md * add scaledAssetDimensions to IngestionProperties
This was referenced May 21, 2022
Closed
Closed
Closed
nourhaanfarid
changed the title
nourhaanfarid
changed the title
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.
MSFT employees can try out our new experience at OpenAPI Hub - one location for using our validation tools and finding your workflow.
Changelog
Add a changelog entry for this PR by answering the following questions:
Contribution checklist:
If any further question about AME onboarding or validation tools, please view the FAQ.
ARM API Review Checklist
Otherwise your PR may be subject to ARM review requirements. Complete the following:
Check this box if any of the following appy to the PR so that the label "ARMReview" and "WaitForARMFeedback" will be added by bot to kick off ARM API Review. Missing to check this box in the following scenario may result in delays to the ARM manifest review and deployment.
-[ ] To review changes efficiently, ensure you are using OpenAPIHub to initialize the PR for adding a new version. More details, refer to the wiki.
Ensure you've reviewed following guidelines including ARM resource provider contract and REST guidelines. Estimated time (4 hours). This is required before you can request review from ARM API Review board.
If you are blocked on ARM review and want to get the PR merged with urgency, please get the ARM oncall for reviews (RP Manifest Approvers team under Azure Resource Manager service) from IcM and reach out to them.
Breaking Change Review Checklist
If any of the following scenarios apply to the PR, request approval from the Breaking Change Review Board as defined in the Breaking Change Policy.
Action: to initiate an evaluation of the breaking change, create a new intake using the template for breaking changes. Addition details on the process and office hours are on the Breaking change Wiki.
Please follow the link to find more details on PR review process.