Skip to content

Commit 4bcbd08

Browse files
authored
Merge branch 'master' into patch-30
2 parents 8560798 + a49408f commit 4bcbd08

File tree

12,258 files changed

+252830
-183424
lines changed

Some content is hidden

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

12,258 files changed

+252830
-183424
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 & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,41 @@
147147
"branch": "master"
148148
},
149149
{
150+
"path_to_root": "functions-python-tensorflow-tutorial",
151+
"url": "https://github.com/Azure-Samples/functions-python-tensorflow-tutorial",
152+
"branch": "master",
153+
"branch_mapping": {}
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+
},
180+
{
181+
"path_to_root": "functions-docs-powershell",
182+
"url": "https://github.com/Azure-Samples/functions-docs-powershell",
183+
"branch": "master"
184+
}, {
150185
"path_to_root": "samples-personalizer",
151186
"url": "https://github.com/Azure-Samples/cognitive-services-personalizer-samples",
152187
"branch": "master"
@@ -413,6 +448,11 @@
413448
"url": "https://github.com/Azure/azure-cosmosdb-java",
414449
"branch": "master"
415450
},
451+
{
452+
"path_to_root": "azure-cosmosdb-graph-dotnet",
453+
"url": "https://github.com/Azure-Samples/azure-cosmos-db-graph-gremlindotnet-getting-started",
454+
"branch": "master"
455+
},
416456
{
417457
"path_to_root": "azure-cosmosdb-java-v4-getting-started",
418458
"url": "https://github.com/Azure-Samples/azure-cosmos-java-getting-started",
@@ -427,14 +467,6 @@
427467
"master": [
428468
"Publish",
429469
"PDF"
430-
],
431-
"release-event-grid": [
432-
"Publish",
433-
"PDF"
434-
],
435-
"hd-insight-pdf": [
436-
"Publish",
437-
"PDF"
438470
]
439471
},
440472
"need_generate_pdf_url_template": true,

0 commit comments

Comments
 (0)