Skip to content

Commit e0017b8

Browse files
Merge Conflict fix
2 parents cafa01f + 5f6f7a5 commit e0017b8

File tree

6,681 files changed

+103730
-83362
lines changed

Some content is hidden

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

6,681 files changed

+103730
-83362
lines changed

.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: 1615 additions & 114 deletions
Large diffs are not rendered by default.

CODEOWNERS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ 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)