Skip to content

Commit 901eaf2

Browse files
authored
Merge pull request #28 from MicrosoftDocs/master
Sync with upstream
2 parents 775b8cb + db93dd5 commit 901eaf2

File tree

8,917 files changed

+190224
-124492
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,917 files changed

+190224
-124492
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: 40 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,46 @@
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-quickstart-templates",
157+
"url": "https://github.com/Azure/azure-functions-templates",
158+
"branch": "dev"
159+
},
160+
{
161+
"path_to_root": "functions-docs-csharp",
162+
"url": "https://github.com/Azure-Samples/functions-docs-csharp",
163+
"branch": "master"
164+
},
165+
{
166+
"path_to_root": "functions-docs-javascript",
167+
"url": "https://github.com/Azure-Samples/functions-docs-javascript",
168+
"branch": "master"
169+
},
170+
{
171+
"path_to_root": "functions-docs-typescript",
172+
"url": "https://github.com/Azure-Samples/functions-docs-typescript",
173+
"branch": "master"
174+
},
175+
{
176+
"path_to_root": "functions-docs-python",
177+
"url": "https://github.com/Azure-Samples/functions-docs-python",
178+
"branch": "master"
179+
},
155180
{
181+
"path_to_root": "functions-docs-powershell",
182+
"url": "https://github.com/Azure-Samples/functions-docs-powershell",
183+
"branch": "master"
184+
}, {
156185
"path_to_root": "samples-personalizer",
157186
"url": "https://github.com/Azure-Samples/cognitive-services-personalizer-samples",
158187
"branch": "master"
159188
},
189+
{
190+
"path_to_root": "samples-cognitive-services-data-files",
191+
"url": "https://github.com/Azure-Samples/cognitive-services-sample-data-files",
192+
"branch": "master"
193+
},
160194
{
161195
"path_to_root": "samples-luis",
162196
"url": "https://github.com/Azure-Samples/cognitive-services-language-understanding",
@@ -419,6 +453,11 @@
419453
"url": "https://github.com/Azure/azure-cosmosdb-java",
420454
"branch": "master"
421455
},
456+
{
457+
"path_to_root": "azure-cosmosdb-graph-dotnet",
458+
"url": "https://github.com/Azure-Samples/azure-cosmos-db-graph-gremlindotnet-getting-started",
459+
"branch": "master"
460+
},
422461
{
423462
"path_to_root": "azure-cosmosdb-java-v4-getting-started",
424463
"url": "https://github.com/Azure-Samples/azure-cosmos-java-getting-started",
@@ -433,14 +472,6 @@
433472
"master": [
434473
"Publish",
435474
"PDF"
436-
],
437-
"release-event-grid": [
438-
"Publish",
439-
"PDF"
440-
],
441-
"hd-insight-pdf": [
442-
"Publish",
443-
"PDF"
444475
]
445476
},
446477
"need_generate_pdf_url_template": true,

0 commit comments

Comments
 (0)