Skip to content

Commit a2f01bf

Browse files
authored
Merge branch 'master' into patch-3
2 parents 8c8b8ad + 4091389 commit a2f01bf

File tree

16,273 files changed

+347930
-221942
lines changed

Some content is hidden

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

16,273 files changed

+347930
-221942
lines changed

.openpublishing.publish.config.json

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,12 @@
4545
"branch": "master",
4646
"branch_mapping": {}
4747
},
48+
{
49+
"path_to_root": "azure_arc_sample",
50+
"url": "https://github.com/microsoft/azure_arc",
51+
"branch": "main",
52+
"branch_mapping": {}
53+
},
4854
{
4955
"path_to_root": "resourcemanager-templates",
5056
"url": "https://github.com/Azure/azure-docs-json-samples",
@@ -424,9 +430,9 @@
424430
"branch_mapping": {}
425431
},
426432
{
427-
"path_to_root": "azureml-examples-cli-preview",
428-
"url": "https://github.com/azure/azureml-examples",
429-
"branch": "cli-preview",
433+
"path_to_root": "terraform",
434+
"url": "https://github.com/Azure/terraform",
435+
"branch": "master",
430436
"branch_mapping": {}
431437
},
432438
{
@@ -585,12 +591,6 @@
585591
"branch": "master",
586592
"branch_mapping": {}
587593
},
588-
{
589-
"path_to_root": "samples-cosmosdb-dotnet-v2",
590-
"url": "https://github.com/Azure/azure-cosmos-dotnet-v2",
591-
"branch": "master",
592-
"branch_mapping": {}
593-
},
594594
{
595595
"path_to_root": "samples-cosmosdb-java-v4-web-app",
596596
"url": "https://github.com/Azure-Samples/azure-cosmos-java-sql-api-todo-app",
@@ -711,12 +711,6 @@
711711
"branch": "master",
712712
"branch_mapping": {}
713713
},
714-
{
715-
"path_to_root": "azure-cosmosdb-java-v2",
716-
"url": "https://github.com/Azure/azure-cosmosdb-java",
717-
"branch": "master",
718-
"branch_mapping": {}
719-
},
720714
{
721715
"path_to_root": "azure-cosmosdb-graph-dotnet",
722716
"url": "https://github.com/Azure-Samples/azure-cosmos-db-graph-gremlindotnet-getting-started",
@@ -819,14 +813,19 @@
819813
".openpublishing.redirection.json",
820814
".openpublishing.redirection.active-directory.json",
821815
".openpublishing.redirection.data-factory.json",
816+
".openpublishing.redirection.defender-for-cloud.json",
822817
".openpublishing.redirection.defender-for-iot.json",
823818
".openpublishing.redirection.healthcare-apis.json",
824819
".openpublishing.redirection.iot-hub.json",
825820
".openpublishing.redirection.key-vault.json",
826821
".openpublishing.redirection.media-services.json",
827822
".openpublishing.redirection.security-benchmark.json",
828823
".openpublishing.redirection.synapse-analytics.json",
824+
".openpublishing.redirection.azure-web-pubsub.json",
825+
"articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
826+
"articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
829827
"articles/azure-relay/.openpublishing.redirection.relay.json",
828+
"articles/communication-services/.openpublishing.redirection.communication-services.json",
830829
"articles/cosmos-db/.openpublishing.redirection.cosmos-db.json",
831830
"articles/cost-management-billing/.openpublishing.redirection.cost-management-billing.json",
832831
"articles/data-catalog/.openpublishing.redirection.data-catalog.json",
@@ -844,6 +843,8 @@
844843
"articles/purview/.openpublishing.redirection.purview.json",
845844
"articles/service-bus-messaging/.openpublishing.redirection.service-bus-messaging.json",
846845
"articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
847-
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json"
846+
"articles/azure-video-analyzer/.openpublishing.redirection.azure-video-analyzer.json",
847+
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
848+
"articles/mysql/.openpublishing.redirection.mysql.json"
848849
]
849850
}

.openpublishing.redirection.active-directory.json

Lines changed: 10597 additions & 20 deletions
Large diffs are not rendered by default.
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/azure-web-pubsub/howto-troubleshoot-diagnostic-logs.md",
5+
"redirect_url": "/azure/azure-web-pubsub/howto-troubleshoot-resource-logs",
6+
"redirect_document_id": false
7+
}
8+
]
9+
}

.openpublishing.redirection.data-factory.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@
1414
"source_path_from_root": "/articles/data-factory/continuous-integration-deployment.md",
1515
"redirect_url": "/azure/data-factory/continuous-integration-delivery",
1616
"redirect_document_id": false
17+
},
18+
{
19+
"source_path_from_root": "/articles/data-factory/continuous-integration-deployment-improvements.md",
20+
"redirect_url": "/azure/data-factory/continuous-integration-delivery-improvements",
21+
"redirect_document_id": false
1722
}
1823
]
1924
}

0 commit comments

Comments
 (0)