Skip to content

Commit 43249ad

Browse files
authored
Merge branch 'master' into patch-4
2 parents 293ef1a + 80f19c5 commit 43249ad

File tree

15,232 files changed

+342279
-229563
lines changed

Some content is hidden

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

15,232 files changed

+342279
-229563
lines changed

.gitignore

Lines changed: 2 additions & 2 deletions
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/
@@ -22,5 +21,6 @@ articles/directories.txt
2221
AzureMigration.ps1
2322

2423
!/.vscode/extensions.json
25-
articles/data-lake-analytics/.vscode/settings.json
2624
.gitignore
25+
**/.vscode/settings.json
26+
!/.vscode/settings.json

.markdownlint.json

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"MD007": false,
1010
"MD009": false,
1111
"MD010": false,
12+
"MD011": true,
1213
"MD012": false,
1314
"MD013": false,
1415
"MD014": false,
@@ -32,10 +33,28 @@
3233
"MD035": false,
3334
"MD036": false,
3435
"MD037": false,
36+
"MD038": true,
37+
"MD039": true,
3538
"MD040": false,
3639
"MD041": false,
3740
"MD042": false,
41+
"MD043": true,
42+
"MD044": {
43+
"code_blocks": false,
44+
"names": [
45+
".NET",
46+
"ASP.NET",
47+
"Azure",
48+
"JavaScript",
49+
"NuGet",
50+
"PowerShell",
51+
"macOS",
52+
"C#",
53+
"CLI"
54+
]
55+
},
3856
"MD045": false,
3957
"MD046": false,
40-
"MD047": false
58+
"MD047": false,
59+
"MD048": true
4160
}

.openpublishing.publish.config.json

Lines changed: 76 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,56 @@
147147
"branch": "master"
148148
},
149149
{
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+
},
155+
{
156+
"path_to_root": "functions-pytorch",
157+
"url": "https://github.com/Azure-Samples/functions-python-pytorch-tutorial",
158+
"branch": "master",
159+
"branch_mapping": {}
160+
},
161+
{
162+
"path_to_root": "functions-quickstart-templates",
163+
"url": "https://github.com/Azure/azure-functions-templates",
164+
"branch": "dev"
165+
},
166+
{
167+
"path_to_root": "functions-docs-csharp",
168+
"url": "https://github.com/Azure-Samples/functions-docs-csharp",
169+
"branch": "master"
170+
},
171+
{
172+
"path_to_root": "functions-docs-javascript",
173+
"url": "https://github.com/Azure-Samples/functions-docs-javascript",
174+
"branch": "master"
175+
},
176+
{
177+
"path_to_root": "functions-docs-typescript",
178+
"url": "https://github.com/Azure-Samples/functions-docs-typescript",
179+
"branch": "master"
180+
},
181+
{
182+
"path_to_root": "functions-docs-python",
183+
"url": "https://github.com/Azure-Samples/functions-docs-python",
184+
"branch": "master"
185+
},
186+
{
187+
"path_to_root": "functions-docs-powershell",
188+
"url": "https://github.com/Azure-Samples/functions-docs-powershell",
189+
"branch": "master"
190+
}, {
150191
"path_to_root": "samples-personalizer",
151192
"url": "https://github.com/Azure-Samples/cognitive-services-personalizer-samples",
152193
"branch": "master"
153194
},
195+
{
196+
"path_to_root": "samples-cognitive-services-data-files",
197+
"url": "https://github.com/Azure-Samples/cognitive-services-sample-data-files",
198+
"branch": "master"
199+
},
154200
{
155201
"path_to_root": "samples-luis",
156202
"url": "https://github.com/Azure-Samples/cognitive-services-language-understanding",
@@ -231,6 +277,11 @@
231277
"url": "https://github.com/Azure/pcs-remote-monitoring-webui.git",
232278
"branch": "master"
233279
},
280+
{
281+
"path_to_root": "MachineLearningNotebooks",
282+
"url": "https://github.com/Azure/MachineLearningNotebooks",
283+
"branch": "master"
284+
},
234285
{
235286
"path_to_root": "aml-sdk-samples",
236287
"url": "https://github.com/Azure/MachineLearningNotebooks",
@@ -306,6 +357,26 @@
306357
"url": "https://github.com/Azure-Samples/azure-sdk-for-go-samples",
307358
"branch": "master"
308359
},
360+
{
361+
"path_to_root": "azure-sdk-for-java-event-hubs",
362+
"url": "https://github.com/Azure/azure-sdk-for-java/",
363+
"branch": "master"
364+
},
365+
{
366+
"path_to_root": "azure-sdk-for-java-script-event-hubs",
367+
"url": "https://github.com/Azure/azure-sdk-for-js/",
368+
"branch": "master"
369+
},
370+
{
371+
"path_to_root": "azure-sdk-for-net-event-hubs",
372+
"url": "https://github.com/Azure/azure-sdk-for-net/",
373+
"branch": "master"
374+
},
375+
{
376+
"path_to_root": "azure-sdk-for-python-event-hubs",
377+
"url": "https://github.com/Azure/azure-sdk-for-python/",
378+
"branch": "master"
379+
},
309380
{
310381
"path_to_root": "cosmos-dotnet-getting-started",
311382
"url": "https://github.com/Azure-Samples/cosmos-dotnet-getting-started",
@@ -413,6 +484,11 @@
413484
"url": "https://github.com/Azure/azure-cosmosdb-java",
414485
"branch": "master"
415486
},
487+
{
488+
"path_to_root": "azure-cosmosdb-graph-dotnet",
489+
"url": "https://github.com/Azure-Samples/azure-cosmos-db-graph-gremlindotnet-getting-started",
490+
"branch": "master"
491+
},
416492
{
417493
"path_to_root": "azure-cosmosdb-java-v4-getting-started",
418494
"url": "https://github.com/Azure-Samples/azure-cosmos-java-getting-started",
@@ -427,14 +503,6 @@
427503
"master": [
428504
"Publish",
429505
"PDF"
430-
],
431-
"release-event-grid": [
432-
"Publish",
433-
"PDF"
434-
],
435-
"hd-insight-pdf": [
436-
"Publish",
437-
"PDF"
438506
]
439507
},
440508
"need_generate_pdf_url_template": true,

0 commit comments

Comments
 (0)