Merge branch 'master' into resources_update_for_m4

Azure · Apr 1, 2020 · 1ff743f · 1ff743f
2 parents f04ed9a + 5e1b628
commit 1ff743f
Show file tree

Hide file tree

Showing 766 changed files with 88,102 additions and 1,960 deletions.
diff --git a/.azure-pipelines-preproduction/package-lock.json b/.azure-pipelines-preproduction/package-lock.json
diff --git a/.azure-pipelines-preproduction/package.json b/.azure-pipelines-preproduction/package.json
@@ -11,7 +11,7 @@
   "license": "MIT",
   "devDependencies": {
     "@azure/avocado": "^0.6.2",
-    "@azure/rest-api-specs-scripts": "^0.6.8",
+    "@azure/rest-api-specs-scripts": "^0.7.1",
     "@ts-common/commonmark-to-markdown": "^1.2.0",
     "@ts-common/fs": "0.2.0",
     "@ts-common/iterator": "^0.3.6",

diff --git a/.github/assignment.yml b/.github/assignment.yml
@@ -83,6 +83,12 @@
       - fengzhou-msft 
       - yungezz
 
+- rule:
+    paths:
+      - "specification/mixedreality/**"
+    reviewers:
+      - leni-msft
+
 - rule:
     paths:
       - "specification/portal/**"

diff --git a/cSpell.json b/cSpell.json
@@ -188,6 +188,12 @@
                 "Exprired"
             ]
         },
+        {
+            "filename": "**/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntime.json",
+            "words": [
+                "Exprired"
+            ]
+        },
         {
             "filename": "**/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/TasksCommon.json",
             "words": [

diff --git a/custom-words.txt b/custom-words.txt
@@ -491,6 +491,7 @@ entrypoint
 environmentsettings
 errordetail
 errored
+ErrorMesssage
 ErrorSchema
 Español
 estaba
@@ -1733,4 +1734,6 @@ bsls
 sessionids
 Dsms
 cloudManifestFiles
-highestcriticalimpact
+highestcriticalimpact
+apiserver
+kubeadmin