conflict resolution #21007
Merged
conflict resolution #21007
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
|
Hi, @forteddyt 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. [email protected] |
Swagger Validation Report
|
| Rule | Message | Related RPC [For API reviewers] |
|---|---|---|
|
"location":"specification/machinelearningservices/resource-manager/readme.md", "tag":"default", "details":"swagger-document-override/md-override-loader - FAILED" |
|
|
"location":"specification/machinelearningservices/resource-manager/readme.md", "tag":"default", "details":"Error: Could not read 'file:///mnt/vss/_work/1/azure-rest-api-specs/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-10-01/machineLearningServices.json'." |
|
|
"location":"specification/machinelearningservices/resource-manager/readme.md", "tag":"default", "details":"swagger-document/loader - FAILED" |
️️✔️Avocado succeeded [Detail] [Expand]
Validation passes for Avocado.
️️✔️ModelValidation succeeded [Detail] [Expand]
Validation passes for ModelValidation.
️️✔️SemanticValidation succeeded [Detail] [Expand]
Validation passes for SemanticValidation.
️️✔️SDK Track2 Validation succeeded [Detail] [Expand]
Validation passes for SDKTrack2Validation
️️✔️PrettierCheck succeeded [Detail] [Expand]
Validation passes for PrettierCheck.
️️✔️SpellCheck succeeded [Detail] [Expand]
Validation passes for SpellCheck.
️️✔️CadlValidation succeeded [Detail] [Expand]
Validation passes for CadlValidation.
️⌛PR Summary pending [Detail]
Swagger Generation Artifacts
|
Generated ApiView
|
Maulik003
approved these changes
Oct 5, 2022
|
Hi @forteddyt, Your PR has some issues. Please fix the CI sequentially by following the order of
|
Maulik003
merged commit 248020b
into
Azure:dev-machinelearningservices-Microsoft.MachineLearningServices-2022-10-01-preview
This was referenced Oct 5, 2022
weshaggard
pushed a commit
that referenced
this pull request
Oct 5, 2022
…to add version preview/2022-10-01-preview (#20818) * Adds base for updating Microsoft.MachineLearningServices from version preview/2022-06-01-preview to version 2022-10-01-preview * Updates readme * Updates API version in new specs and examples * Registries public preview 2022-10-01-preview (#20200) * Registries public preview 2022-10-01-preview * Fix validation errors * Fix LintDiff and Avocado errors * Fixing prettier errors * Fixing more LintDiff errors * Another LintDiff error * Another Lint error Co-authored-by: Fahd Kamal <[email protected]> * Added schedule api (#20273) * added schedule api * add updateSchedules to examples parent folder * fix typo * change position of allOf * remove subnet from example compute create * after prettier run * Description change for recurrence freq * point to mfe for common objects * add hash operator * removed triggertype as well * change year * get rid of breaking changes since we didn't change the api Co-authored-by: Naman Agarwal <[email protected]> * Added Compute Instance OS Patching Properties (#20284) * Added CI Os Patching related properties * Updated descriptions as per Dennis's suggestions Co-authored-by: Srivatsa Sinha <[email protected]> * Maulik/sync preview (#20554) * Added changes to sync with main * Fixed Prettier Check Co-authored-by: maulikjoshi <[email protected]> * Remove update schedules REST call for compute instance (#20699) * change post call to put * change put to patch * remove updateschedules rest call Co-authored-by: Naman Agarwal <[email protected]> * Update connection type and auth type (#20493) * Update connection type and auth type * update connection category * update x-ms-secret tag * Add autologger_settings for CI (#20302) * Add autologger_settings for CI Add settings to opt-in/out of default mlflow autologger on CIs. * update machinelearningservices.json * Add for command job * fix comma * Add autologger for command job * fix CI failures * Remove mfe.json from PR * Remove whitespace * Update custom-words.txt * Delete incorrect custom-words.txt * Fixing auto-rest issues in registries (#20772) * Fixing auto-rest issues in registries * Removing location from the required list Co-authored-by: Fahd Kamal <[email protected]> * Maulik/mfe preview changes (#20372) * Added mfe.json preview changes * Added resources to Registries and Workspaces folder * removed unwanted resources * removed unwanted resources * Ran prettier check * removed unwanted resources * removed unwanted resources * Added ManagedOnlineDeployment resource * Added files to OnlineDeplyment * Added Model Validation changes * Added mfe.json changes to handle duplicate operation id changes * Updated mfe to fix underscore error * Update title of mfe.json * Renamed name path parameter * Updated examples * Fixed Semantic validations and examples * Fixed Semantic validations and examples * Fixed Semantic validations and examples * Removed name changes from workspaces * Changes related to Model Validation * Changes related to Model validation * Added consumes amd produces in registries.json * Removed changes from registries * Updated parameter mlFlowAutologger to mlflowAutologger in mfe.json * Changed property name to mlflowAutologger Co-authored-by: maulikjoshi <[email protected]> * Updated custom words to resolve merge conflict (#20833) * Updated custom words to resolve merge conflict * Updated custom words to resolve merge conflict Co-authored-by: maulikjoshi <[email protected]> * Resolved merge conflict (#20845) Co-authored-by: maulikjoshi <[email protected]> * Fixed LintDiff checks (#20847) * Fixed LintDiff checks * Fixed LintDiff checks * Fixed LintDiff checks * Fixed LintDiff checks * Updated examples Co-authored-by: maulikjoshi <[email protected]> * Resolved merge conflict of cutsom-words.txt (#20956) * Resolved merge conflict * Resolved merge conflict Co-authored-by: maulikjoshi <[email protected]> * [Hub Generated] Review request for Microsoft.MachineLearningServices to add version stable/2022-10-01 (#20800) (#20982) * Adds base for updating Microsoft.MachineLearningServices from version stable/2022-05-01 to version 2022-10-01 * Updates readme * Updates API version in new specs and examples * Added readOnly property (#20506) * Added readOnly property * Added changes to sync with main * Fixed Prettier check Co-authored-by: maulikjoshi <[email protected]> * Add schedule related schemas for Compute Instance (#20697) * support for update schedules on Compute Instance * change put to patch * remove update schedules rest call Co-authored-by: Naman Agarwal <[email protected]> * Added mfe.json changes (#20514) * Added mfe.json changes * Added checks related changes * Updated mfe.json to handle online endpoint and deployment changes * Updated mfe.json with AutoRebuild changes Co-authored-by: maulikjoshi <[email protected]> * Removed duplicate definitions and updated with mfe references (#20840) * Removed duplicate definitions and updated with mfe references * Replaced Cron to CronTrigger, Recurrence to RecurrenceTrigger from mfe Co-authored-by: maulikjoshi <[email protected]> Co-authored-by: maulikjoshi <[email protected]> Co-authored-by: Naman Agarwal <[email protected]> Co-authored-by: Naman Agarwal <[email protected]> Co-authored-by: maulikjoshi <[email protected]> Co-authored-by: Naman Agarwal <[email protected]> Co-authored-by: Naman Agarwal <[email protected]> * Revert "[Hub Generated] Review request for Microsoft.MachineLearningS… (#20983) * Revert "[Hub Generated] Review request for Microsoft.MachineLearningServices to add version stable/2022-10-01 (#20800) (#20982)" This reverts commit 649ef83. * Updated readme.md to resolve merge conflict Co-authored-by: maulikjoshi <[email protected]> * Maulik/fix preview (#20994) * Merged readme from main * Added preview tag changes Co-authored-by: maulikjoshi <[email protected]> * shuffle readme tags (#21005) * conflict resolution (#21007) Co-authored-by: fahdkmsft <[email protected]> Co-authored-by: Fahd Kamal <[email protected]> Co-authored-by: Naman Agarwal <[email protected]> Co-authored-by: Naman Agarwal <[email protected]> Co-authored-by: srivatsasinha <[email protected]> Co-authored-by: Srivatsa Sinha <[email protected]> Co-authored-by: maulikjoshi <[email protected]> Co-authored-by: ZhidaLiu <[email protected]> Co-authored-by: prakharg-msft <[email protected]> Co-authored-by: Teddy Todorov <[email protected]>
anandanthony
pushed a commit
to anandMicro/azure-rest-api-specs
that referenced
this pull request
Dec 16, 2022
…to add version preview/2022-10-01-preview (Azure#20818) * Adds base for updating Microsoft.MachineLearningServices from version preview/2022-06-01-preview to version 2022-10-01-preview * Updates readme * Updates API version in new specs and examples * Registries public preview 2022-10-01-preview (Azure#20200) * Registries public preview 2022-10-01-preview * Fix validation errors * Fix LintDiff and Avocado errors * Fixing prettier errors * Fixing more LintDiff errors * Another LintDiff error * Another Lint error Co-authored-by: Fahd Kamal <[email protected]> * Added schedule api (Azure#20273) * added schedule api * add updateSchedules to examples parent folder * fix typo * change position of allOf * remove subnet from example compute create * after prettier run * Description change for recurrence freq * point to mfe for common objects * add hash operator * removed triggertype as well * change year * get rid of breaking changes since we didn't change the api Co-authored-by: Naman Agarwal <[email protected]> * Added Compute Instance OS Patching Properties (Azure#20284) * Added CI Os Patching related properties * Updated descriptions as per Dennis's suggestions Co-authored-by: Srivatsa Sinha <[email protected]> * Maulik/sync preview (Azure#20554) * Added changes to sync with main * Fixed Prettier Check Co-authored-by: maulikjoshi <[email protected]> * Remove update schedules REST call for compute instance (Azure#20699) * change post call to put * change put to patch * remove updateschedules rest call Co-authored-by: Naman Agarwal <[email protected]> * Update connection type and auth type (Azure#20493) * Update connection type and auth type * update connection category * update x-ms-secret tag * Add autologger_settings for CI (Azure#20302) * Add autologger_settings for CI Add settings to opt-in/out of default mlflow autologger on CIs. * update machinelearningservices.json * Add for command job * fix comma * Add autologger for command job * fix CI failures * Remove mfe.json from PR * Remove whitespace * Update custom-words.txt * Delete incorrect custom-words.txt * Fixing auto-rest issues in registries (Azure#20772) * Fixing auto-rest issues in registries * Removing location from the required list Co-authored-by: Fahd Kamal <[email protected]> * Maulik/mfe preview changes (Azure#20372) * Added mfe.json preview changes * Added resources to Registries and Workspaces folder * removed unwanted resources * removed unwanted resources * Ran prettier check * removed unwanted resources * removed unwanted resources * Added ManagedOnlineDeployment resource * Added files to OnlineDeplyment * Added Model Validation changes * Added mfe.json changes to handle duplicate operation id changes * Updated mfe to fix underscore error * Update title of mfe.json * Renamed name path parameter * Updated examples * Fixed Semantic validations and examples * Fixed Semantic validations and examples * Fixed Semantic validations and examples * Removed name changes from workspaces * Changes related to Model Validation * Changes related to Model validation * Added consumes amd produces in registries.json * Removed changes from registries * Updated parameter mlFlowAutologger to mlflowAutologger in mfe.json * Changed property name to mlflowAutologger Co-authored-by: maulikjoshi <[email protected]> * Updated custom words to resolve merge conflict (Azure#20833) * Updated custom words to resolve merge conflict * Updated custom words to resolve merge conflict Co-authored-by: maulikjoshi <[email protected]> * Resolved merge conflict (Azure#20845) Co-authored-by: maulikjoshi <[email protected]> * Fixed LintDiff checks (Azure#20847) * Fixed LintDiff checks * Fixed LintDiff checks * Fixed LintDiff checks * Fixed LintDiff checks * Updated examples Co-authored-by: maulikjoshi <[email protected]> * Resolved merge conflict of cutsom-words.txt (Azure#20956) * Resolved merge conflict * Resolved merge conflict Co-authored-by: maulikjoshi <[email protected]> * [Hub Generated] Review request for Microsoft.MachineLearningServices to add version stable/2022-10-01 (Azure#20800) (Azure#20982) * Adds base for updating Microsoft.MachineLearningServices from version stable/2022-05-01 to version 2022-10-01 * Updates readme * Updates API version in new specs and examples * Added readOnly property (Azure#20506) * Added readOnly property * Added changes to sync with main * Fixed Prettier check Co-authored-by: maulikjoshi <[email protected]> * Add schedule related schemas for Compute Instance (Azure#20697) * support for update schedules on Compute Instance * change put to patch * remove update schedules rest call Co-authored-by: Naman Agarwal <[email protected]> * Added mfe.json changes (Azure#20514) * Added mfe.json changes * Added checks related changes * Updated mfe.json to handle online endpoint and deployment changes * Updated mfe.json with AutoRebuild changes Co-authored-by: maulikjoshi <[email protected]> * Removed duplicate definitions and updated with mfe references (Azure#20840) * Removed duplicate definitions and updated with mfe references * Replaced Cron to CronTrigger, Recurrence to RecurrenceTrigger from mfe Co-authored-by: maulikjoshi <[email protected]> Co-authored-by: maulikjoshi <[email protected]> Co-authored-by: Naman Agarwal <[email protected]> Co-authored-by: Naman Agarwal <[email protected]> Co-authored-by: maulikjoshi <[email protected]> Co-authored-by: Naman Agarwal <[email protected]> Co-authored-by: Naman Agarwal <[email protected]> * Revert "[Hub Generated] Review request for Microsoft.MachineLearningS… (Azure#20983) * Revert "[Hub Generated] Review request for Microsoft.MachineLearningServices to add version stable/2022-10-01 (Azure#20800) (Azure#20982)" This reverts commit 649ef83. * Updated readme.md to resolve merge conflict Co-authored-by: maulikjoshi <[email protected]> * Maulik/fix preview (Azure#20994) * Merged readme from main * Added preview tag changes Co-authored-by: maulikjoshi <[email protected]> * shuffle readme tags (Azure#21005) * conflict resolution (Azure#21007) Co-authored-by: fahdkmsft <[email protected]> Co-authored-by: Fahd Kamal <[email protected]> Co-authored-by: Naman Agarwal <[email protected]> Co-authored-by: Naman Agarwal <[email protected]> Co-authored-by: srivatsasinha <[email protected]> Co-authored-by: Srivatsa Sinha <[email protected]> Co-authored-by: maulikjoshi <[email protected]> Co-authored-by: ZhidaLiu <[email protected]> Co-authored-by: prakharg-msft <[email protected]> Co-authored-by: Teddy Todorov <[email protected]>
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.
Choose a PR Template
Switch to "Preview" on this description then select one of the choices below.
Click here to open a PR for a Data Plane API.
Click here to open a PR for a Control Plane (ARM) API.