Skip to content

Commit 154b11f

Browse files
Merge remote-tracking branch 'upstream/master'
2 parents a0ac325 + 3543928 commit 154b11f

File tree

14,499 files changed

+303508
-227407
lines changed

Some content is hidden

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

14,499 files changed

+303508
-227407
lines changed

.openpublishing.publish.config.json

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,12 +157,17 @@
157157
"url": "https://github.com/Azure-Samples/functions-python-pytorch-tutorial",
158158
"branch": "master",
159159
"branch_mapping": {}
160-
},
160+
},
161161
{
162162
"path_to_root": "functions-quickstart-templates",
163163
"url": "https://github.com/Azure/azure-functions-templates",
164164
"branch": "dev"
165165
},
166+
{
167+
"path_to_root": "functions-quickstart-java",
168+
"url": "https://github.com/Azure-Samples/functions-quickstarts-java",
169+
"branch": "master"
170+
},
166171
{
167172
"path_to_root": "functions-docs-csharp",
168173
"url": "https://github.com/Azure-Samples/functions-docs-csharp",
@@ -187,7 +192,8 @@
187192
"path_to_root": "functions-docs-powershell",
188193
"url": "https://github.com/Azure-Samples/functions-docs-powershell",
189194
"branch": "master"
190-
}, {
195+
},
196+
{
191197
"path_to_root": "samples-personalizer",
192198
"url": "https://github.com/Azure-Samples/cognitive-services-personalizer-samples",
193199
"branch": "master"
@@ -227,6 +233,11 @@
227233
"url": "https://github.com/Azure-Samples/azure-iot-samples-node",
228234
"branch": "master"
229235
},
236+
{
237+
"path_to_root": "azure-iot-sdk-node",
238+
"url": "https://github.com/Azure/azure-iot-sdk-node",
239+
"branch": "master"
240+
},
230241
{
231242
"path_to_root": "iot-samples-c",
232243
"url": "https://github.com/Azure/azure-iot-sdk-c",
@@ -277,6 +288,11 @@
277288
"url": "https://github.com/Azure/pcs-remote-monitoring-webui.git",
278289
"branch": "master"
279290
},
291+
{
292+
"path_to_root": "MachineLearningNotebooks",
293+
"url": "https://github.com/Azure/MachineLearningNotebooks",
294+
"branch": "master"
295+
},
280296
{
281297
"path_to_root": "aml-sdk-samples",
282298
"url": "https://github.com/Azure/MachineLearningNotebooks",
@@ -361,7 +377,7 @@
361377
"path_to_root": "azure-sdk-for-java-script-event-hubs",
362378
"url": "https://github.com/Azure/azure-sdk-for-js/",
363379
"branch": "master"
364-
},
380+
},
365381
{
366382
"path_to_root": "azure-sdk-for-net-event-hubs",
367383
"url": "https://github.com/Azure/azure-sdk-for-net/",
@@ -371,7 +387,7 @@
371387
"path_to_root": "azure-sdk-for-python-event-hubs",
372388
"url": "https://github.com/Azure/azure-sdk-for-python/",
373389
"branch": "master"
374-
},
390+
},
375391
{
376392
"path_to_root": "cosmos-dotnet-getting-started",
377393
"url": "https://github.com/Azure-Samples/cosmos-dotnet-getting-started",
@@ -488,6 +504,11 @@
488504
"path_to_root": "azure-cosmosdb-java-v4-getting-started",
489505
"url": "https://github.com/Azure-Samples/azure-cosmos-java-getting-started",
490506
"branch": "master"
507+
},
508+
{
509+
"path_to_root": "azure-storage-snippets",
510+
"url": "https://github.com/azure-samples/AzureStorageSnippets",
511+
"branch": "master"
491512
}
492513
],
493514
"branch_target_mapping": {
@@ -505,5 +526,8 @@
505526
"Pdf": {
506527
"template_folder": "_themes.pdf"
507528
}
529+
},
530+
"docs_build_engine": {
531+
"name": "docfx_v3"
508532
}
509533
}

0 commit comments

Comments
 (0)