Skip to content

Commit

Permalink
Merge branch 'Azure:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
vaishnavi-janardhan authored Jul 26, 2021
2 parents 108fb2c + e3dbb82 commit 7ef5d8d
Show file tree
Hide file tree
Showing 4,974 changed files with 784,783 additions and 61,866 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-data-container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ schedules:
displayName: Daily build
branches:
include:
- master
- main
always: true

pool:
Expand Down
2 changes: 1 addition & 1 deletion .github/comment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
booleanFilterExpression: "!(ARMSignedOff||ARMChangesRequested||Approved-OkToMerge||WaitForARMRevisit)"
onCheckedLabels:
- WaitForARMFeedback
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} "
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)."

- rule:
type: label
Expand Down
8 changes: 8 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
version: 2

updates:
- package-ecosystem: npm
directory: "/"
schedule:
interval: weekly
open-pull-requests-limit: 10
2 changes: 2 additions & 0 deletions .github/pull_request_assignment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -208,3 +208,5 @@
- jianyexi
- zhenglaizhang
- chunyu3
- changlong-liu
- msyyc
2 changes: 1 addition & 1 deletion CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
/specification/authorization/ @darshanhs90 @stankovski
/specification/automation/ @vrdmr
/specification/azsadmin/ @deathly809
/specification/batch/ @matthchr @xingwu1
/specification/batch/ @paterasMSFT @dpwatrous
/specification/batchai/ @alexanderyukhanov
/specification/billing/ @wilcobmsft @asarkar84
/specification/cdn/ @csmengwan @injyzarif @prakharsharma10
Expand Down
12 changes: 6 additions & 6 deletions arm-compute/quickstart-templates/aliases.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@
"sku": "7.5",
"version": "latest"
},
"CoreOS": {
"publisher": "CoreOS",
"offer": "CoreOS",
"sku": "Stable",
"version": "latest"
},
"Debian": {
"publisher": "Debian",
"offer": "debian-10",
"sku": "10",
"version": "latest"
},
"Flatcar": {
"publisher": "kinvolk",
"offer": "flatcar-container-linux-free",
"sku": "stable",
"version": "latest"
},
"openSUSE-Leap": {
"publisher": "SUSE",
"offer": "openSUSE-Leap",
Expand Down
1 change: 0 additions & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ variables:

jobs:
- template: .azure-pipelines/BranchProtectionForPrivateRepo.yml
- template: .azure-pipelines/Syntax.yml
- template: .azure-pipelines/NetworkValidation.yml
- template: .azure-pipelines/Spellcheck.yml
- template: .azure-pipelines/PrettierCheck.yml
16 changes: 15 additions & 1 deletion cSpell.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"softwareTerms",
"typescript"
],
"overrides": [
"overrides": [
{
"filename": "**/specification/databox/resource-manager/Microsoft.DataBox/stable/2018-01-01/databox.json",
"words": [
Expand Down Expand Up @@ -70,6 +70,12 @@
"Tera"
]
},
{
"filename": "**/specification/databox/resource-manager/Microsoft.DataBox/stable/2021-05-01/databox.json",
"words": [
"Tera"
]
},
{
"filename": "**/specification/servicebus/resource-manager/Microsoft.ServiceBus/stable/2017-04-01/Rules.json",
"words": [
Expand Down Expand Up @@ -762,6 +768,14 @@
"Fpushpins"
]
},
{
"filename": "**/specification/maps/data-plane/Render/preview/1.0/render.json",
"words": [
"Chttp",
"Fcontoso",
"Fpushpins"
]
},
{
"filename": "**/specification/communication/data-plane/Chat/preview/2020-09-21-preview2/communicationserviceschat.json",
"words": [
Expand Down
Loading

0 comments on commit 7ef5d8d

Please sign in to comment.