Fix merge conflict

Author: Rajeev Vokkarne

.azure-pipelines-preproduction/package-lock.json

@@ -25,7 +25,8 @@
     "ts-node": "^8.1.0",
     "tslib": "^1.10.0",
     "typescript": "3.5.3",
-    "prettier": "^1.18.2"
+    "prettier": "^1.18.2",
+    "minimist": "^1.2.3"
   },
   "homepage": "https://github.com/azure/azure-rest-api-specs",
   "repository": {

.azure-pipelines-preproduction/package.json

@@ -42,6 +42,8 @@ jobs:
         SDK_REPO_NAME: azure-sdk-for-go
       Trenton:
         SDK_REPO_NAME: azure-sdk-for-trenton
+      Schema:
+        SDK_REPO_NAME: azure-resource-manager-schemas
   steps:
   - checkout: none
   - script: |

.azure-pipelines/BreakingChange.yml

@@ -0,0 +1,42 @@
+schedules:
+- cron: "0 0 * * *"
+  displayName: Daily build
+  branches:
+    include:
+    - master
+  always: true
+
+pool:
+  vmImage: 'Ubuntu-16.04'
+
+variables:
+  IMAGE_TAG_PREFIX: $[format('1.0.{0:HHm}', pipeline.startTime)]
+
+steps:
+- task: Docker@2
+  displayName: Login to production ACR
+  inputs:
+    command: login
+    containerRegistry: $(CONTAINER_REGISTRY_SERVICE_CONNECTION)
+
+- task: Docker@2
+  displayName: Login to dogfood ACR
+  inputs:
+    command: login
+    containerRegistry: $(DOGFOOD_CONTAINER_REGISTRY_SERVICE_CONNECTION)
+
+- task: CopyFiles@2
+  inputs:
+    SourceFolder: $(Build.SourcesDirectory)
+    contents: .git/**
+    targetFolder: $(Build.SourcesDirectory)/scripts/datacontainer
+
+- task: Docker@2
+  displayName: Build and Push
+  inputs:
+    command: buildAndPush
+    Dockerfile: scripts/datacontainer/Dockerfile
+    repository: $(CONTAINER_REGISTRY_REPOSITORY_NAME)
+    tags: |
+      latest
+      $(IMAGE_TAG_PREFIX)$(Build.BuildNumber)

.azure-pipelines/SDKAutomation.yml

@@ -2,19 +2,27 @@
 </i>
 
 ### Contribution checklist:
+- [ ] I commit to follow the [Breaking Change Policy](http://aka.ms/bcforapi) of “no breaking changes
 - [ ] I have reviewed the [documentation](https://aka.ms/ameonboard) for the workflow.
-- [ ] [Validation tools](https://aka.ms/swaggertools) were run on swagger spec(s) and have all been fixed in this PR. [How to fix?](https://aka.ms/ci-fix)
+- [ ] [Validation tools](https://aka.ms/swaggertools) were run on swagger spec(s) and errors have all been fixed in this PR. [How to fix?](https://aka.ms/ci-fix)
 
 If any further question about AME onboarding or validation tools, please view the [FAQ](https://aka.ms/faqinprreview).
 
 ### ARM API Review Checklist
-- [ ] Service team MUST add the "**WaitForARMFeedback**" label if the management plane API changes fall into one of the below categories. 
-  - adding/removing APIs.
-  - adding/removing properties.
-  - adding/removing API-version. 
-  - adding a new service in Azure.
+- [ ] Ensure to check this box if one of the following scenarios meet updates in the PR, so that label “WaitForARMFeedback” will be added automatically to involve ARM API Review. Failure to comply may result in delays for manifest application. Note this does not apply to data plane APIs, all “removals” and “adding a new property” no more require ARM API review.
+  - Adding new API(s)
+  - Adding a new API version
+  - Adding a new service
 
-<i>Failure to comply may result in delays for manifest application. Note this does not apply to data plane APIs.</i>
+- [ ] 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 <ins>Azure Resource Manager service</ins>) from IcM and reach out to them. 
 
-- [ ] If you are blocked on ARM review and want to get the PR merged urgently, please get the ARM oncall for reviews (RP Manifest Approvers team under Azure Resource Manager service) from IcM and reach out to them. 
-Please follow the link to find more details on [API review process](https://aka.ms/SwaggerPRReview).
+### Breaking Change Review Checklist 
+If there are following updates in the PR, ensure to request an approval from API Review Board as defined in the [Breaking Change Policy](http://aka.ms/bcforapi). 
+
+- [ ] Removing API(s) in stable version
+- [ ] Removing properties in stable version
+- [ ] Removing API version(s) in stable version
+- [ ] Updating API in stable version with Breaking Change Validation errors
+- [ ] Updating API(s) in preview over 1 year
+
+Please follow the link to find more details on [PR review process](https://aka.ms/SwaggerPRReview).

.azure-pipelines/azure-pipelines-data-container.yml

@@ -3,7 +3,6 @@
     booleanFilterExpression: "needs-triage"
     assignees:
       - yungezz
-      - zikalino
       - erich-wang
       - NullMDR
       - raych1
@@ -20,3 +19,4 @@
       - qianwens
       - ruowan
       - MyronFanQiu
+      - jianyexi

.github/PULL_REQUEST_TEMPLATE.md

@@ -13,7 +13,6 @@
     paths:
       - "specification/network/**"
     reviewers:
-      - lirenhe
       - MyronFanQiu
 
 - rule:
@@ -96,6 +95,7 @@
 - rule:
     paths:
       - "specification/mixedreality/**"
+      - "specification/hdinsight/**"
     reviewers:
       - leni-msft
 
@@ -136,7 +136,6 @@
       - "**"
     reviewers:
       - yungezz
-      - zikalino
       - erich-wang
       - NullMDR
       - raych1
@@ -152,3 +151,4 @@
       - leni-msft
       - qianwens
       - ruowan
+      - jianyexi