Skip to content

Commit 340f678

Browse files
authored
Merge branch 'master' into master
2 parents 987bcca + 00d46cb commit 340f678

File tree

20,333 files changed

+441347
-270143
lines changed

Some content is hidden

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

20,333 files changed

+441347
-270143
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,5 @@ articles/directories.txt
2222
AzureMigration.ps1
2323

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

.openpublishing.publish.config.json

Lines changed: 58 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,12 @@
9090
"url": "https://github.com/Azure/azure-docs-json-samples",
9191
"branch": "master"
9292
},
93+
{
94+
"path_to_root": "samples-key-vault-dotnet-quickstart",
95+
"url": "https://github.com/Azure-Samples/key-vault-dotnet-core-quickstart",
96+
"branch": "master",
97+
"branch_mapping": {}
98+
},
9399
{
94100
"path_to_root": "samples-mediaservices-integration",
95101
"url": "https://github.com/Azure-Samples/media-services-dotnet-functions-integration",
@@ -188,7 +194,7 @@
188194
{
189195
"path_to_root": "samples-cognitive-services-speech-sdk",
190196
"url": "https://github.com/Azure-Samples/cognitive-services-speech-sdk",
191-
"branch": "docs-201809"
197+
"branch": "rhurey/quickstart.refactor"
192198
},
193199
{
194200
"path_to_root": "media-services-v3-dotnet-quickstarts",
@@ -265,6 +271,21 @@
265271
"url": "https://github.com/Azure-Samples/cognitive-services-java-sdk-samples",
266272
"branch": "master"
267273
},
274+
{
275+
"path_to_root": "cognitive-services-node-sdk-samples",
276+
"url": "https://github.com/Azure-Samples/cognitive-services-node-sdk-samples",
277+
"branch": "master"
278+
},
279+
{
280+
"path_to_root": "cognitive-services-ruby-sdk-samples",
281+
"url": "https://github.com/Azure-Samples/cognitive-services-ruby-sdk-samples",
282+
"branch": "master"
283+
},
284+
{
285+
"path_to_root": "cognitive-services-rest-samples",
286+
"url": "https://github.com/Azure-Samples/cognitive-services-REST-api-samples",
287+
"branch": "master"
288+
},
268289
{
269290
"path_to_root": "cognitive-services-vision-csharp-sdk-quickstarts",
270291
"url": "https://github.com/Azure-Samples/cognitive-services-vision-csharp-sdk-quickstarts",
@@ -280,22 +301,42 @@
280301
"url": "https://github.com/Azure-Samples/cognitive-services-face-android-detect",
281302
"branch": "master"
282303
},
304+
{
305+
"path_to_root": "azure-sdk-for-go-samples",
306+
"url": "https://github.com/Azure-Samples/azure-sdk-for-go-samples",
307+
"branch": "master"
308+
},
283309
{
284310
"path_to_root": "cosmos-dotnet-getting-started",
285311
"url": "https://github.com/Azure-Samples/cosmos-dotnet-getting-started",
286312
"branch": "master",
287313
"branch_mapping": {}
288314
},
315+
{
316+
"path_to_root": "cosmos-dotnet-v4-getting-started",
317+
"url": "https://github.com/Azure-Samples/cosmos-dotnet-v4-getting-started",
318+
"branch": "master"
319+
},
320+
{
321+
"path_to_root": "cosmos-dotnet-bulk-import",
322+
"url": "https://github.com/Azure-Samples/cosmos-dotnet-bulk-import-throughput-optimizer",
323+
"branch": "master"
324+
},
289325
{
290326
"path_to_root": "samples-cosmosdb-dotnet-web-app",
291327
"url": "https://github.com/Azure-Samples/cosmos-dotnet-todo-app",
292328
"branch": "master"
293329
},
294-
{
330+
{
295331
"path_to_root": "samples-cosmosdb-dotnet-v3",
296332
"url": "https://github.com/Azure/azure-cosmos-dotnet-v3",
297333
"branch": "master"
298334
},
335+
{
336+
"path_to_root": "samples-cosmosdb-dotnet-v2",
337+
"url": "https://github.com/Azure/azure-cosmos-dotnet-v2",
338+
"branch": "master"
339+
},
299340
{
300341
"path_to_root": "samples-cosmosdb-dotnet-change-feed-processor",
301342
"url": "https://github.com/Azure-Samples/cosmos-dotnet-change-feed-processor",
@@ -316,6 +357,11 @@
316357
"url": "https://github.com/Azure-Samples/azure-cosmos-db-sql-api-nodejs-getting-started",
317358
"branch": "master"
318359
},
360+
{
361+
"path_to_root": "azure-cosmos-db-python-getting-started",
362+
"url": "https://github.com/Azure-Samples/azure-cosmos-db-python-getting-started",
363+
"branch": "master"
364+
},
319365
{
320366
"path_to_root": "cognitive-services-content-moderator-samples",
321367
"url": "https://github.com/Azure-Samples/cognitive-services-content-moderator-samples",
@@ -361,6 +407,16 @@
361407
"url": "https://github.com/microsoft/immersive-reader-sdk",
362408
"branch": "master",
363409
"branch_mapping": {}
410+
},
411+
{
412+
"path_to_root": "azure-cosmosdb-java-v2",
413+
"url": "https://github.com/Azure/azure-cosmosdb-java",
414+
"branch": "master"
415+
},
416+
{
417+
"path_to_root": "azure-cosmosdb-java-v4-getting-started",
418+
"url": "https://github.com/Azure-Samples/azure-cosmos-java-getting-started",
419+
"branch": "master"
364420
}
365421
],
366422
"branch_target_mapping": {

0 commit comments

Comments
 (0)