Skip to content

Commit 7e3bc3c

Browse files
author
David Curwin
committed
Fix conflict
2 parents 0725d80 + f97050e commit 7e3bc3c

File tree

1,535 files changed

+17235
-19861
lines changed

Some content is hidden

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

1,535 files changed

+17235
-19861
lines changed

.openpublishing.publish.config.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1282,6 +1282,7 @@
12821282
"articles/mysql/.openpublishing.redirection.mysql.json",
12831283
"articles/network-watcher/.openpublishing.redirection.network-watcher.json",
12841284
"articles/object-anchors/.openpublishing.redirection.object-anchors.json",
1285+
"articles/operator-insights/.openpublishing.redirection.operator-insights.json",
12851286
"articles/operator-nexus/.openpublishing.redirection.operator-nexus.json",
12861287
"articles/peering-service/.openpublishing.redirection.peering-service.json",
12871288
"articles/postgresql/.openpublishing.redirection.postgresql.json",

.openpublishing.redirection.azure-monitor.json

Lines changed: 316 additions & 316 deletions
Large diffs are not rendered by default.

.openpublishing.redirection.defender-for-cloud.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -920,6 +920,11 @@
920920
"redirect_url": "/azure/defender-for-cloud/multicloud",
921921
"redirect_document_id": false
922922
},
923+
{
924+
"source_path_from_root": "/articles/defender-for-cloud/defender-for-containers-vulnerability-assessment-azure.md",
925+
"redirect_url": "/azure/defender-for-cloud/agentless-vulnerability-assessment-azure",
926+
"redirect_document_id": false
927+
},
923928
{
924929
"source_path_from_root": "/articles/defender-for-cloud/concept-aws-connector.md",
925930
"redirect_url": "/azure/defender-for-cloud/quickstart-onboard-aws",

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9385,6 +9385,11 @@
93859385
"redirect_url": "/visualstudio/containers/overview-local-process-kubernetes",
93869386
"redirect_document_id": false
93879387
},
9388+
{
9389+
"source_path_from_root": "/articles/docker/index.yml",
9390+
"redirect_url": "/dotnet/architecture/microservices/container-docker-introduction/docker-defined",
9391+
"redirect_document_id": false
9392+
},
93889393
{
93899394
"source_path_from_root": "/articles/vs-azure-tools-docker-edit-and-refresh.md",
93909395
"redirect_url": "/visualstudio/docker/vs-azure-tools-docker-edit-and-refresh",

.openpublishing.redirection.sentinel.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1055,6 +1055,21 @@
10551055
"redirect_url": "/azure/sentinel/normalization-schema-process-event",
10561056
"redirect_document_id": true
10571057
},
1058+
{
1059+
"source_path_from_root": "/articles/sentinel/connect-cef-ama.md",
1060+
"redirect_url": "/azure/sentinel/connect-cef-syslog-ama",
1061+
"redirect_document_id": false
1062+
},
1063+
{
1064+
"source_path_from_root": "/articles/sentinel/connect-cef-syslog.md",
1065+
"redirect_url": "/azure/sentinel/connect-cef-syslog-ama",
1066+
"redirect_document_id": false
1067+
},
1068+
{
1069+
"source_path_from_root": "/articles/sentinel/connect-cef-syslog-options.md",
1070+
"redirect_url": "/azure/sentinel/connect-cef-syslog-ama",
1071+
"redirect_document_id": false
1072+
},
10581073
{
10591074
"source_path_from_root": "/articles/sentinel/notebooks-with-synapse.md",
10601075
"redirect_url": "/azure/sentinel/notebooks-hunt",

.whatsnew/.application-management.json

Lines changed: 0 additions & 24 deletions
This file was deleted.

.whatsnew/.application-provisioning.json

Lines changed: 0 additions & 24 deletions
This file was deleted.

.whatsnew/.application-proxy.json

Lines changed: 0 additions & 24 deletions
This file was deleted.

.whatsnew/.azure-monitor.json

Lines changed: 0 additions & 77 deletions
This file was deleted.

.whatsnew/.cognitive-services.json

Lines changed: 0 additions & 135 deletions
This file was deleted.

0 commit comments

Comments
 (0)