Skip to content

Commit 73ad772

Browse files
Merge branch 'master' into patch-51
2 parents 52fd3b2 + 4a68469 commit 73ad772

File tree

7,143 files changed

+135292
-92540
lines changed

Some content is hidden

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

7,143 files changed

+135292
-92540
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
Thumbs.db
44

55
# Visual Studio and VS Code files
6-
.settings.json
76
.vscode/*
87
.vs/*
98
log/
@@ -24,3 +23,4 @@ AzureMigration.ps1
2423
!/.vscode/extensions.json
2524
.gitignore
2625
**/.vscode/settings.json
26+
!/.vscode/settings.json

.openpublishing.publish.config.json

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,12 @@
146146
"url": "https://github.com/Azure/azure-functions-durable-extension",
147147
"branch": "master"
148148
},
149+
{
150+
"path_to_root": "functions-python-tensorflow-tutorial",
151+
"url": "https://github.com/Azure-Samples/functions-python-tensorflow-tutorial",
152+
"branch": "master",
153+
"branch_mapping": {}
154+
},
149155
{
150156
"path_to_root": "samples-personalizer",
151157
"url": "https://github.com/Azure-Samples/cognitive-services-personalizer-samples",
@@ -427,14 +433,6 @@
427433
"master": [
428434
"Publish",
429435
"PDF"
430-
],
431-
"release-event-grid": [
432-
"Publish",
433-
"PDF"
434-
],
435-
"hd-insight-pdf": [
436-
"Publish",
437-
"PDF"
438436
]
439437
},
440438
"need_generate_pdf_url_template": true,

.openpublishing.redirection.json

Lines changed: 2147 additions & 226 deletions
Large diffs are not rendered by default.

.vscode/settings.json

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
{
2+
"markdown.docsetLanguages": [
3+
".NET Core CLI",
4+
"Apache",
5+
"ASPX",
6+
"AzCopy",
7+
"Azure CLI",
8+
"Azure CLI (Interactive)",
9+
"Azure Powershell",
10+
"Azure Powershell (Interactive)",
11+
"Bash",
12+
"C",
13+
"C#",
14+
"C# (Interactive)",
15+
"C++",
16+
"CSS",
17+
"DAX Power BI",
18+
"Diff",
19+
"Dockerfile",
20+
"DOS",
21+
"F#",
22+
"Go",
23+
"Gradle",
24+
"Groovy",
25+
"HTML",
26+
"HTTP",
27+
"Ini",
28+
"Java",
29+
"JavaScript",
30+
"JSON",
31+
"Kotlin",
32+
"Kusto",
33+
"Markdown",
34+
"MS Graph (Interactive)",
35+
"Objective C",
36+
"PHP",
37+
"Plaintext no highlight",
38+
"PostgreSQL & PL/pgSQL",
39+
"PowerShell",
40+
"PowerShell (Interactive)",
41+
"Properties",
42+
"Python",
43+
"R",
44+
"Razor CSHTML",
45+
"Ruby",
46+
"Scala",
47+
"Shell",
48+
"Solidity",
49+
"SQL",
50+
"Swift",
51+
"Terraform (HCL)",
52+
"TypeScript",
53+
"VB.NET",
54+
"XAML",
55+
"XML",
56+
"YAML"
57+
]
58+
}

CODEOWNERS

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
# Testing the new code owners feature in GitHub. Please contact Cory Fowler if you have questions.
22
# Cognitive Services
3-
articles/cognitive-services/ @diberry @erhopf, @nitinme
3+
articles/cognitive-services/ @diberry @erhopf @aahill @ievangelist @patrickfarley @nitinme
44

55
# DevOps
66
articles/ansible/ @TomArcherMsft
77
articles/chef/ @TomArcherMsft
88
articles/jenkins/ @TomArcherMsft
99
articles/terraform/ @TomArcherMsft
1010

11+
# Requires Internal Review
12+
articles/best-practices-availability-paired-regions.md @jpconnock @arob98 @syntaxc4 @tysonn @snoviking
13+
1114
# Governance
1215
articles/governance/ @DCtheGeek
1316

0 commit comments

Comments
 (0)