This repository was archived by the owner on Aug 26, 2025. It is now read-only.
[Mirror] Resolving merge conflict#2762
Closed
ruowan wants to merge 8 commits into
Closed
Conversation
…022-05-01 to version 2022-10-01
* Upgrading Scheduled Actions API to GA * First commit:- upgrading existing API to GA version * Upgraded api-version * Adding Operations API in common-types * upgrading api-version in Operations example * referencing common operation def * removing reference to common Operation as it caused multiple validation errors * renaming Operation to CostManagementOperation and referencing Operation from V3 types * fixing csv
* SavingsPlan GA changes Fix validation errors Rebase with shared branch Correct version in the common-types file Review comments Review comments Refer grain enum in parameter Correct enum type Review comments More improvements * Fix duplicated model lint diff error * Use common types v2 * Move to v2 types.json * Corrected examples
…re#21036) * First commit - copying cost management and exports API from 2021-10-01 * Upgrading version * Adding costmanagement.generatedetailedcostreport.json * fixing validation errors * fixing validation errors * fixing validation errors * reverting parameter order update * Reverting CostManagementProxyResource and CostManagementResource changes after breaking changes office hours discussion * ddressing review comments * Resolving code review comments * Qualifying Resource and ProxyResource with CostManagement prefix Please enter the commit message for your changes. Lines starting * Addressing review comments * fixing example file names * fixing linter error * updated operationResults description * Reverting breaking changes in exports API * fixing validation error * Rebasing with latest * fixing billingAccountIdParameter definition conflict * fixing billing profile id parameter conflict * Addressing code review comment * fixing model validation errors
* Create costmanagement.pricesheets.json * Create PricesheetDownload.json * Create PricesheetDownloadByBillingProfile.json * Create OperationList.json * Update readme.md * Update readme.md * Update costmanagement.pricesheets.json * Update costmanagement.pricesheets.json * Update costmanagement.pricesheets.json * Update costmanagement.pricesheets.json * Update PricesheetDownload.json * Update PricesheetDownloadByBillingProfile.json * Update costmanagement.pricesheets.json * Update costmanagement.pricesheets.json * Update costmanagement.pricesheets.json * Update costmanagement.pricesheets.json * Update costmanagement.pricesheets.json * Delete OperationList.json * Update costmanagement.pricesheets.json * Update costmanagement.pricesheets.json * Update PricesheetDownload.json * Update PricesheetDownloadByBillingProfile.json * Update PricesheetDownload.json * Update PricesheetDownloadByBillingProfile.json * Update PricesheetDownloadByBillingProfile.json * Update costmanagement.pricesheets.json * Update costmanagement.pricesheets.json * Update costmanagement.pricesheets.json * resolve Go SDK stuttering issue * Update costmanagement.pricesheets.json * Update readme.md * Update costmanagement.pricesheets.json * Update costmanagement.pricesheets.json * Update costmanagement.pricesheets.json * Update PricesheetDownload.json * Update PricesheetDownloadByBillingProfile.json * Delete BenefitRecommendationsByRecommendationId.json * Update costmanagement.benefits.json * Update costmanagement.pricesheets.json * Update costmanagement.pricesheets.json * Update common-types.json * Update costmanagement.pricesheets.json * Update costmanagement.generatedetailedcostreport.json * Update common-types.json * Update common-types.json * Update common-types.json * Update common-types.json * Update common-types.json * resolve Go SDK naming collision Co-authored-by: Chenjie Shi <tadelesh.shi@live.cn>
|
Swagger pipeline can not start as the pull request has merge conflicts. |
|
Hi, @ruowan Thanks for your PR. I am workflow bot for review process. Here are some small tips. Any feedback about review process or workflow bot, pls contact swagger and tools team. vscswagger@microsoft.com |
|
Swagger pipeline can not start as the pull request has merge conflicts. |
|
Swagger pipeline started successfully. If there is ApiView generated, it will be updated in this comment. |
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
5 participants
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.
Mirror from
https://github.com/Azure/azure-rest-api-specs/pull/21371