Skip to content

Commit 45422e3

Browse files
authored
Merge branch 'master' into vedara/AppInsights_IP_addresses_CE2_Update
2 parents 5b6c630 + f419061 commit 45422e3

File tree

26,987 files changed

+529754
-307521
lines changed

Some content is hidden

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

26,987 files changed

+529754
-307521
lines changed

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Operating System files
2-
.DS_Store
2+
.DS_Store
33
Thumbs.db
44

55
# Visual Studio and VS Code files
@@ -21,4 +21,4 @@ _themes.VS.Modern/
2121
articles/directories.txt
2222
AzureMigration.ps1
2323

24-
!/.vscode/extensions.json
24+
!/.vscode/extensions.json

.openpublishing.publish.config.json

Lines changed: 34 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
"version": 0
2222
}
2323
],
24-
"notification_subscribers": [],
24+
"notification_subscribers": [
25+
26+
],
2527
"sync_notification_subscribers": [
2628
2729
],
@@ -32,6 +34,12 @@
3234
"need_preview_pull_request": true,
3335
"contribution_branch_mappings": {},
3436
"dependent_repositories": [
37+
{
38+
"path_to_root": "quickstart-templates",
39+
"url": "https://github.com/Azure/azure-quickstart-templates",
40+
"branch": "master",
41+
"branch_mapping": {}
42+
},
3543
{
3644
"path_to_root": "_themes",
3745
"url": "https://github.com/Microsoft/templates.docs.msft",
@@ -68,11 +76,13 @@
6876
"path_to_root": "policy-templates",
6977
"url": "https://github.com/Azure/azure-policy",
7078
"branch": "master",
71-
"branch_mapping": {
72-
"release-build-mysql": "release-build",
73-
"release-build-postgresql": "release-build",
74-
"release-build-stellar": "release-build"
75-
}
79+
"branch_mapping": {}
80+
},
81+
{
82+
"path_to_root": "blueprints-templates",
83+
"url": "https://github.com/Azure/azure-blueprints",
84+
"branch": "master",
85+
"branch_mapping": {}
7686
},
7787
{
7888
"path_to_root": "azure-docs-json-samples",
@@ -200,6 +210,12 @@
200210
"branch": "tutorial",
201211
"branch_mapping": {}
202212
},
213+
{
214+
"path_to_root": "samples-tsi",
215+
"url": "https://github.com/Azure-Samples/Azure-Time-Series-Insights",
216+
"branch": "master",
217+
"branch_mapping": {}
218+
},
203219
{
204220
"path_to_root": "media-services-v3-dotnet-core-tutorials",
205221
"url": "https://github.com/Azure-Samples/media-services-v3-dotnet-core-tutorials",
@@ -314,11 +330,23 @@
314330
"branch": "master",
315331
"branch_mapping": {}
316332
},
333+
{
334+
"path_to_root": "samples-fbPageModeration",
335+
"url": "https://github.com/MicrosoftContentModerator/samples-fbPageModeration",
336+
"branch": "master",
337+
"branch_mapping": {}
338+
},
317339
{
318340
"path_to_root": "AIVisualProvision",
319341
"url": "https://github.com/Microsoft/AIVisualProvision",
320342
"branch": "master",
321343
"branch_mapping": {}
344+
},
345+
{
346+
"path_to_root": "VideoReviewConsoleApp",
347+
"url": "https://github.com/MicrosoftContentModerator/VideoReviewConsoleApp",
348+
"branch": "master",
349+
"branch_mapping": {}
322350
}
323351
],
324352
"branch_target_mapping": {

.openpublishing.redirection.json

Lines changed: 3769 additions & 832 deletions
Large diffs are not rendered by default.
File renamed without changes.
File renamed without changes.

.github/CONTRIBUTING.md renamed to CONTRIBUTING.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
# Contributing to Microsoft Azure Documentation
22

3-
> Between March 5th and March 9th 2019, the MicrosoftDocs/azure-docs repo will be undergoing a Migration from it's current Markdown engine to the [Markdig](https://github.com/lunet-io/markdig) markdown engine. During this time, we will be turning off the ability to suspending merging of public pull requests in order to complete the migration.
4-
53
Thank you for taking the time to contribute to the Microsoft Azure documentation.
64

75
This guide covers some general topics around contribution and refers out to our [contributors guide](https://docs.microsoft.com/contribute) for more detailed explanations where relevant.

FETCH_HEAD

Whitespace-only changes.
File renamed without changes.

.github/LICENSE renamed to LICENSE

File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)