Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix bad merge. #2022

Merged
merged 1 commit into from
Nov 16, 2017
Merged

Fix bad merge. #2022

merged 1 commit into from
Nov 16, 2017

Conversation

jhendrixMSFT
Copy link
Member

This checklist is used to make sure that common issues in a pull request are addressed. This will expedite the process of getting your pull request merged and avoid extra work on your part to fix issues discovered during the review process.

PR information

  • The title of the PR is clear and informative.
  • There are a small number of commits, each of which have an informative message. This means that previously merged commits do not appear in the history of the PR. For information on cleaning up the commits in your pull request, see this page.
  • Except for special cases involving multiple contributors, the PR is started from a fork of the main repository, not a branch.
  • If applicable, the PR references the bug/issue that it fixes.
  • Swagger files are correctly named (e.g. the api-version in the path should match the api-version in the spec).

Quality of Swagger

@jhendrixMSFT jhendrixMSFT self-assigned this Nov 16, 2017
@azuresdkciprbot
Copy link

Hi There,

I am the AutoRest Linter Azure bot. I am here to help. My task is to analyze the situation from the AutoRest linter perspective. Please review the below analysis result:

💡 Please review potentially introduced Error(s)/Warning(s): Analysis Report 💡

File: specification/automation/resource-manager/readme.md
Before the PR: Warning(s): 0 Error(s): 0
After the PR: Warning(s): 0 Error(s): 77

AutoRest Linter Guidelines | AutoRest Linter Issues | Send feedback

Thanks for your co-operation.

@jhendrixMSFT
Copy link
Member Author

Introduced in PR #2009.

finiteattractor
finiteattractor approved these changes Nov 16, 2017
View reviewed changes
Copy link
Contributor

@finiteattractor finiteattractor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My bad! Thanks for fixing it!!

@jhendrixMSFT jhendrixMSFT merged commit d2a21a3 into Azure:current Nov 16, 2017
@AutorestCI
Copy link

No modification for AutorestCI/azure-sdk-for-python

@AutorestCI
Copy link

No modification for AutorestCI/azure-sdk-for-node

@AutorestCI AutorestCI mentioned this pull request Nov 16, 2017
Closed
@AutorestCI
Copy link

Build Status Azure/azure-sdk-for-ruby#1140

sergey-shandar pushed a commit that referenced this pull request Nov 22, 2017
@murilogiacometti @sergey-shandar
[Network-2017-11-01] Pull latest from current (#2039)
a0257f9 
* Video Swagger API: update example response json to remove special invalid special characters (#2015)

* Add Video Search API Swagger

* Video Swagger API: update example response json to remove special invalid special characters

* take changes from azure-rest-spec-pr, make Microsoft.Subscription tenant level rp (#1984)

* Fix bad merge. (#2022)

* Add list apis for sql backup LTR policies & vaults (#2006)

* Add list LTR vaults & policies

* Added pageable

* Change output folder for Search SDKs (#2023)

* update output folders in readmes

* rename with bing in name

* App Model for Tumbling window trigger (#2028)

* App model for tumbling window trigger

* Addressed CR comments

* Renamed retry to count in RetryPolicy

* swagger definition for 26 RFI connectors (#2016)

* Updated OMS data plane C# namespace & output-folder (#2021)

* Update Azure Batch enum to use "values" - also some documentation updates (#2008)

* Enum fixes

* Improve DataDisks documentation

* Update NATPool port range documentation

* [Compute] Update Sku APIs (#2034)

* Initial commit of 2017-12-01 compute.json

* Changes for new API version 2017-12-01 compute.json

* Add Compute SKU APIs

* Add swagger spec for spell check API (#1997)

* Add swagger spec for spell check API

* Add Examples to spec

* Remove redundant forward slash in path. Specify array from body parameters.

* Fix oav errors

* Remove x-Bing_Apis-SDK

* Change spec to reflect what objects we want to expose in the response.

* Fix operationId name to avoid conflict with "SpellCheck" schema.

* Add X-BingApis-SDK back.

* Remove Unintentional change 

Packages.json change here was unintentionally added to this review
sergey-shandar pushed a commit that referenced this pull request Nov 27, 2017
@chandrasekarsrinivasan @sergey-shandar
Add 2017-11-01 folder in microsoft.network (#2019)
1fc1bf2 
* Video Swagger API: update example response json to remove special invalid special characters (#2015)

* Add Video Search API Swagger

* Video Swagger API: update example response json to remove special invalid special characters

* take changes from azure-rest-spec-pr, make Microsoft.Subscription tenant level rp (#1984)

* Fix bad merge. (#2022)

* Add 2017-11-01 folder in microsoft.network
sergey-shandar pushed a commit that referenced this pull request Jan 11, 2018
@chandrasekarsrinivasan @sergey-shandar
Merge Network 2017-11-01 to master (#2203)
b0e4eae 
* [Network-2017-11-01] Pull latest from current (#2039)

* Video Swagger API: update example response json to remove special invalid special characters (#2015)

* Add Video Search API Swagger

* Video Swagger API: update example response json to remove special invalid special characters

* take changes from azure-rest-spec-pr, make Microsoft.Subscription tenant level rp (#1984)

* Fix bad merge. (#2022)

* Add list apis for sql backup LTR policies & vaults (#2006)

* Add list LTR vaults & policies

* Added pageable

* Change output folder for Search SDKs (#2023)

* update output folders in readmes

* rename with bing in name

* App Model for Tumbling window trigger (#2028)

* App model for tumbling window trigger

* Addressed CR comments

* Renamed retry to count in RetryPolicy

* swagger definition for 26 RFI connectors (#2016)

* Updated OMS data plane C# namespace & output-folder (#2021)

* Update Azure Batch enum to use "values" - also some documentation updates (#2008)

* Enum fixes

* Improve DataDisks documentation

* Update NATPool port range documentation

* [Compute] Update Sku APIs (#2034)

* Initial commit of 2017-12-01 compute.json

* Changes for new API version 2017-12-01 compute.json

* Add Compute SKU APIs

* Add swagger spec for spell check API (#1997)

* Add swagger spec for spell check API

* Add Examples to spec

* Remove redundant forward slash in path. Specify array from body parameters.

* Fix oav errors

* Remove x-Bing_Apis-SDK

* Change spec to reflect what objects we want to expose in the response.

* Fix operationId name to avoid conflict with "SpellCheck" schema.

* Add X-BingApis-SDK back.

* Remove Unintentional change 

Packages.json change here was unintentionally added to this review

* Add 2017-11-01 folder in microsoft.network (#2019)

* Video Swagger API: update example response json to remove special invalid special characters (#2015)

* Add Video Search API Swagger

* Video Swagger API: update example response json to remove special invalid special characters

* take changes from azure-rest-spec-pr, make Microsoft.Subscription tenant level rp (#1984)

* Fix bad merge. (#2022)

* Add 2017-11-01 folder in microsoft.network

* Add Ip Tags into Swagger (#2145)

* add iptags for publicip in 2017-11-01

* read me changes for 2017-11-01

* Add Python conf for Network 2017-11-01

* Complete Python conf for 2017-11-01

* Updated LB InboundNatPool API (#2150)

* Revert "[Network-2017-11-01] Pull latest from current (#2039)"

This reverts commit a0257f9.

* Moving to stable folder to account for refactoring changes in dec 2017
mccleanp pushed a commit that referenced this pull request Mar 23, 2022
@akning-ms
Merge pull request #2022 from abatishchev/alexbat/req-1
1c2014f 
Added back required properties and secrets on Instance in DeviceUpdate
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mcardosos mcardosos mcardosos approved these changes

@finiteattractor finiteattractor finiteattractor approved these changes

Assignees

@jhendrixMSFT jhendrixMSFT

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@jhendrixMSFT @azuresdkciprbot @AutorestCI @mcardosos @finiteattractor