Skip to content

Commit acfbe61

Browse files
authored
Merge branch 'master' into new-ise-connectors
2 parents 0404349 + 15f8af5 commit acfbe61

File tree

13,766 files changed

+277371
-209546
lines changed

Some content is hidden

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

13,766 files changed

+277371
-209546
lines changed

.openpublishing.publish.config.json

Lines changed: 23 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"
@@ -277,6 +283,11 @@
277283
"url": "https://github.com/Azure/pcs-remote-monitoring-webui.git",
278284
"branch": "master"
279285
},
286+
{
287+
"path_to_root": "MachineLearningNotebooks",
288+
"url": "https://github.com/Azure/MachineLearningNotebooks",
289+
"branch": "master"
290+
},
280291
{
281292
"path_to_root": "aml-sdk-samples",
282293
"url": "https://github.com/Azure/MachineLearningNotebooks",
@@ -361,7 +372,7 @@
361372
"path_to_root": "azure-sdk-for-java-script-event-hubs",
362373
"url": "https://github.com/Azure/azure-sdk-for-js/",
363374
"branch": "master"
364-
},
375+
},
365376
{
366377
"path_to_root": "azure-sdk-for-net-event-hubs",
367378
"url": "https://github.com/Azure/azure-sdk-for-net/",
@@ -371,7 +382,7 @@
371382
"path_to_root": "azure-sdk-for-python-event-hubs",
372383
"url": "https://github.com/Azure/azure-sdk-for-python/",
373384
"branch": "master"
374-
},
385+
},
375386
{
376387
"path_to_root": "cosmos-dotnet-getting-started",
377388
"url": "https://github.com/Azure-Samples/cosmos-dotnet-getting-started",
@@ -488,6 +499,11 @@
488499
"path_to_root": "azure-cosmosdb-java-v4-getting-started",
489500
"url": "https://github.com/Azure-Samples/azure-cosmos-java-getting-started",
490501
"branch": "master"
502+
},
503+
{
504+
"path_to_root": "azure-storage-snippets",
505+
"url": "https://github.com/azure-samples/AzureStorageSnippets",
506+
"branch": "master"
491507
}
492508
],
493509
"branch_target_mapping": {
@@ -505,5 +521,8 @@
505521
"Pdf": {
506522
"template_folder": "_themes.pdf"
507523
}
524+
},
525+
"docs_build_engine": {
526+
"name": "docfx_v3"
508527
}
509528
}

0 commit comments

Comments
 (0)