Skip to content

Commit 7ef5d8d

Browse files
Merge branch 'Azure:master' into master
2 parents 108fb2c + e3dbb82 commit 7ef5d8d

File tree

4,974 files changed

+784783
-61866
lines changed

Some content is hidden

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

4,974 files changed

+784783
-61866
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ schedules:
33
displayName: Daily build
44
branches:
55
include:
6-
- master
6+
- main
77
always: true
88

99
pool:

.github/comment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
booleanFilterExpression: "!(ARMSignedOff||ARMChangesRequested||Approved-OkToMerge||WaitForARMRevisit)"
77
onCheckedLabels:
88
- WaitForARMFeedback
9-
onCheckedComments: "Hi, @${PRAuthor} your PR are labelled with <b> WaitForARMFeedback</b>. A notification email will be sent out shortly afterwards to notify ARM review board(armapireview@microsoft.com). cc @${PRAssignee} "
9+
onCheckedComments: "Hi, @${PRAuthor} your PR are labelled with <b> WaitForARMFeedback</b>. A notification email will be sent out shortly afterwards to notify ARM review board(armapireview@microsoft.com)."
1010

1111
- rule:
1212
type: label

.github/dependabot.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
version: 2
2+
3+
updates:
4+
- package-ecosystem: npm
5+
directory: "/"
6+
schedule:
7+
interval: weekly
8+
open-pull-requests-limit: 10

.github/pull_request_assignment.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,3 +208,5 @@
208208
- jianyexi
209209
- zhenglaizhang
210210
- chunyu3
211+
- changlong-liu
212+
- msyyc

CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/specification/authorization/ @darshanhs90 @stankovski
99
/specification/automation/ @vrdmr
1010
/specification/azsadmin/ @deathly809
11-
/specification/batch/ @matthchr @xingwu1
11+
/specification/batch/ @paterasMSFT @dpwatrous
1212
/specification/batchai/ @alexanderyukhanov
1313
/specification/billing/ @wilcobmsft @asarkar84
1414
/specification/cdn/ @csmengwan @injyzarif @prakharsharma10

arm-compute/quickstart-templates/aliases.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@
1515
"sku": "7.5",
1616
"version": "latest"
1717
},
18-
"CoreOS": {
19-
"publisher": "CoreOS",
20-
"offer": "CoreOS",
21-
"sku": "Stable",
22-
"version": "latest"
23-
},
2418
"Debian": {
2519
"publisher": "Debian",
2620
"offer": "debian-10",
2721
"sku": "10",
2822
"version": "latest"
2923
},
24+
"Flatcar": {
25+
"publisher": "kinvolk",
26+
"offer": "flatcar-container-linux-free",
27+
"sku": "stable",
28+
"version": "latest"
29+
},
3030
"openSUSE-Leap": {
3131
"publisher": "SUSE",
3232
"offer": "openSUSE-Leap",

azure-pipelines.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ variables:
1919

2020
jobs:
2121
- template: .azure-pipelines/BranchProtectionForPrivateRepo.yml
22-
- template: .azure-pipelines/Syntax.yml
2322
- template: .azure-pipelines/NetworkValidation.yml
2423
- template: .azure-pipelines/Spellcheck.yml
2524
- template: .azure-pipelines/PrettierCheck.yml

cSpell.json

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"softwareTerms",
4040
"typescript"
4141
],
42-
"overrides": [
42+
"overrides": [
4343
{
4444
"filename": "**/specification/databox/resource-manager/Microsoft.DataBox/stable/2018-01-01/databox.json",
4545
"words": [
@@ -70,6 +70,12 @@
7070
"Tera"
7171
]
7272
},
73+
{
74+
"filename": "**/specification/databox/resource-manager/Microsoft.DataBox/stable/2021-05-01/databox.json",
75+
"words": [
76+
"Tera"
77+
]
78+
},
7379
{
7480
"filename": "**/specification/servicebus/resource-manager/Microsoft.ServiceBus/stable/2017-04-01/Rules.json",
7581
"words": [
@@ -762,6 +768,14 @@
762768
"Fpushpins"
763769
]
764770
},
771+
{
772+
"filename": "**/specification/maps/data-plane/Render/preview/1.0/render.json",
773+
"words": [
774+
"Chttp",
775+
"Fcontoso",
776+
"Fpushpins"
777+
]
778+
},
765779
{
766780
"filename": "**/specification/communication/data-plane/Chat/preview/2020-09-21-preview2/communicationserviceschat.json",
767781
"words": [

0 commit comments

Comments
 (0)