Skip to content

Commit 9cb1293

Browse files
authored
Merge pull request #1 from Azure/master
Merge from origin
2 parents e9428e8 + 7586a48 commit 9cb1293

File tree

825 files changed

+94858
-2388
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

825 files changed

+94858
-2388
lines changed

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

Lines changed: 142 additions & 44 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.azure-pipelines-preproduction/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"license": "MIT",
1212
"devDependencies": {
1313
"@azure/avocado": "^0.6.2",
14-
"@azure/rest-api-specs-scripts": "^0.6.8",
14+
"@azure/rest-api-specs-scripts": "^0.7.1",
1515
"@ts-common/commonmark-to-markdown": "^1.2.0",
1616
"@ts-common/fs": "0.2.0",
1717
"@ts-common/iterator": "^0.3.6",

.github/assignment.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,12 @@
8383
- fengzhou-msft
8484
- yungezz
8585

86+
- rule:
87+
paths:
88+
- "specification/mixedreality/**"
89+
reviewers:
90+
- leni-msft
91+
8692
- rule:
8793
paths:
8894
- "specification/portal/**"

cSpell.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,12 @@
188188
"Exprired"
189189
]
190190
},
191+
{
192+
"filename": "**/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntime.json",
193+
"words": [
194+
"Exprired"
195+
]
196+
},
191197
{
192198
"filename": "**/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/TasksCommon.json",
193199
"words": [

custom-words.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,6 +491,7 @@ entrypoint
491491
environmentsettings
492492
errordetail
493493
errored
494+
ErrorMesssage
494495
ErrorSchema
495496
Español
496497
estaba
@@ -1733,4 +1734,6 @@ bsls
17331734
sessionids
17341735
Dsms
17351736
cloudManifestFiles
1736-
highestcriticalimpact
1737+
highestcriticalimpact
1738+
apiserver
1739+
kubeadmin

0 commit comments

Comments
 (0)