Skip to content

Commit ca09307

Browse files
authored
Merge branch 'master' into wedsFixes
2 parents 9207e07 + 80f19c5 commit ca09307

File tree

8,761 files changed

+196584
-120060
lines changed

Some content is hidden

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

8,761 files changed

+196584
-120060
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: 71 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,52 @@
151151
"url": "https://github.com/Azure-Samples/functions-python-tensorflow-tutorial",
152152
"branch": "master",
153153
"branch_mapping": {}
154-
},
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+
},
155176
{
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+
}, {
156191
"path_to_root": "samples-personalizer",
157192
"url": "https://github.com/Azure-Samples/cognitive-services-personalizer-samples",
158193
"branch": "master"
159194
},
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+
},
160200
{
161201
"path_to_root": "samples-luis",
162202
"url": "https://github.com/Azure-Samples/cognitive-services-language-understanding",
@@ -237,6 +277,11 @@
237277
"url": "https://github.com/Azure/pcs-remote-monitoring-webui.git",
238278
"branch": "master"
239279
},
280+
{
281+
"path_to_root": "MachineLearningNotebooks",
282+
"url": "https://github.com/Azure/MachineLearningNotebooks",
283+
"branch": "master"
284+
},
240285
{
241286
"path_to_root": "aml-sdk-samples",
242287
"url": "https://github.com/Azure/MachineLearningNotebooks",
@@ -312,6 +357,26 @@
312357
"url": "https://github.com/Azure-Samples/azure-sdk-for-go-samples",
313358
"branch": "master"
314359
},
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+
},
315380
{
316381
"path_to_root": "cosmos-dotnet-getting-started",
317382
"url": "https://github.com/Azure-Samples/cosmos-dotnet-getting-started",
@@ -419,6 +484,11 @@
419484
"url": "https://github.com/Azure/azure-cosmosdb-java",
420485
"branch": "master"
421486
},
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+
},
422492
{
423493
"path_to_root": "azure-cosmosdb-java-v4-getting-started",
424494
"url": "https://github.com/Azure-Samples/azure-cosmos-java-getting-started",
@@ -433,14 +503,6 @@
433503
"master": [
434504
"Publish",
435505
"PDF"
436-
],
437-
"release-event-grid": [
438-
"Publish",
439-
"PDF"
440-
],
441-
"hd-insight-pdf": [
442-
"Publish",
443-
"PDF"
444506
]
445507
},
446508
"need_generate_pdf_url_template": true,

0 commit comments

Comments
 (0)