Skip to content

fixing overwritting issue#2364

Merged
marstr merged 1 commit intoAzure:masterfrom
azhao155:master
Feb 1, 2018
Merged

fixing overwritting issue#2364
marstr merged 1 commit intoAzure:masterfrom
azhao155:master

Conversation

@azhao155
Copy link
Contributor

@azhao155 azhao155 commented Jan 30, 2018

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

@azhao155
Copy link
Contributor Author

1497fea
have overwritten some changes in Oct and Nov version, this is the fix.

@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:

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

AutoRest Linter Guidelines | AutoRest Linter Issues | Send feedback

Thanks for your co-operation.

@AutorestCI
Copy link

Did a commit to Azure/azure-sdk-for-go:
Azure/azure-sdk-for-go@0719658

@AutorestCI
Copy link

Did a commit to Azure/azure-sdk-for-python:
Azure/azure-sdk-for-python@4e8cd54

@marstr
Copy link
Member

marstr commented Jan 30, 2018

Usurping this PR because I have some context. I hope you don't mind, @olydis!

@marstr
Copy link
Member

marstr commented Jan 30, 2018

@azhao155, I have some homework for you. Could you please find me the most recent API Version/commit with these changes that you are looking to replicate into this API Version? Bonus points if you can find me the PRs which introduced the changes that you're re-applying here. It'll help me speed up the process of reviewing, and maybe help us skip some of the process to get these in ASAP.

@azhao155
Copy link
Contributor Author

@marstr
the 1101 under stable folder should contain all the changes, and the following are the changes i made and corresponding PR:

#2203
LoadBalancerCreateWithInboundNatPool.json
PublicIpAddressGet.json
PublicIpAddressList.json
loadBalancer.json
publicIpAddress.json

#2223
NetworkWatcherConnectionMonitorCreate.json
NetworkWatcherConnectionMonitorGet.json
NetworkWatcherConnectionMonitorList.json
NetworkWatcherConnectionMonitorQuery.json
NetworkWatcherConnectionMonitorStart.json
NetworkWatcherConnectionMonitorStop.json
networkWatcher.json

#2276
RouteFilterRuleCreate.json
RouteFilterRuleGet.json
RouteFilterRuleListByRouteFilter.json
RouteFilterRuleUpdate.json
routeFilter.json

@marstr
Copy link
Member

marstr commented Jan 30, 2018

Thanks @azhao155, I'll start taking a look at that now.

azhao155 pushed a commit to azhao155/azure-rest-api-specs that referenced this pull request Jan 30, 2018
@marstr
Copy link
Member

marstr commented Feb 1, 2018

I've confirmed that, other than version number strings, the following addition is the only difference between master's 2017-11-01 API Version and @azhao155's 2018-01-1 API Version.

"requestBodyCheck": { 
          "type": "boolean", 
           "description": "Whether allow WAF to check request Body." 
}, 
"maxRequestBodySize": { 
           "type": "integer", 
           "format": "int32", 
           "maximum": 128, 
           "exclusiveMaximum": false, 
           "minimum": 8, 
           "exclusiveMinimum": false, 
           "description": "Maxium request body size for WAF."

@marstr marstr merged commit ac3f87a into Azure:master Feb 1, 2018
marstr pushed a commit that referenced this pull request Feb 1, 2018
azhao155 pushed a commit to azhao155/azure-sdk-for-net that referenced this pull request Feb 2, 2018
shahabhijeet pushed a commit to Azure/azure-sdk-for-net that referenced this pull request Feb 3, 2018
#4026)

* sdk generation related to Swagger pr: Azure/azure-rest-api-specs#2364

* generate from local build

* update to right version
dsgouda pushed a commit that referenced this pull request Mar 23, 2018
… 2018 (#2642)

* Add support for Express Route Circuit Connection resource as a child of Express Route Circuit Peering in 2018-02-01 API (#2358)

* copy all files from 2018-01-01 to 2018-02-01

* update api version to 2018 in all files

* add express route circuit connection as child of express route bgp peering

* update readme.md

* add examples

* fix travis build error

* fix travis build error

* fix indentation errors

* update reference to circuit connections in peering

* fix indentation

* Merge Express Route Circuit Connection to Networking2018-02-01 (#2370)

* copy all files from 2018-01-01 to 2018-02-01

* update api version to 2018 in all files

* add express route circuit connection as child of express route bgp peering

* update readme.md

* add examples

* fix travis build error

* fix travis build error

* fix indentation errors

* update reference to circuit connections in peering

* fix indentation

* fix indentation

* fix indentation'

* get latest file

* Fix indentation

* fix key

* fix indentation and example

* fix indentation

* fix indentation

* make circuit con singular

* add fix as PR #2364 (#2376)

* Network feature: Setting custom ipsec policy for Virtual Network Gateway P2S clients. (#2521)

* 1443089: Network feature: Setting custom ipsec policy for Virtual Network Gateway P2S clients.

* 1443089:Fix network ReadMe file.

* 1443089:Fix network ReadMe file.

* Temporary bug fix

* Add support for Express Route Provider APIs (#2532)

* Add support for Express Route Provider APIs

A new top level NRP resource ExpressRouteCrossConnection is being
introduced with this change. This resource shadows the customer
ExpressRouteCircuit resouce in the customer subscription and enables
the     provider to perform CRUD operations on some of the
sub-resources, such as peerings on the ExpressRoute Circuit

* remove wrong enum values from circuit connection status and fix enum … (#2572)

* remove wrong enum values from circuit connection status and fix enum name

* Update ExpressRouteCrossConnection Route Table Summary Record (#2574)

* Update CrossConnection Route Table Summary record

* [Network-2018-02-01] DDoS Protection Plan resource (#2567)

* Initial version

* Add eol

* Add extra property in example

* Add default values for fields

* Rename operation IDs

* Make 'id' read-only for all network resources

* Revert "Make 'id' read-only for all network resources"

* Fix reference

* making peer express route circuit peering and express route circuit peering as references (#2696)

* Express Route Cross Connection Swagger changes as per PM requirements (#2644)

* Fixed operationIds for non-CRUD operations in ExpressRouteCrossConnections (#2720)

* Making travis run > 10 mins (#2739)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants