Skip to content

Commit 19d9bde

Browse files
committed
Fix merge conflicts
2 parents 2b480b9 + 81aace2 commit 19d9bde

23 files changed

+78
-649
lines changed

.openpublishing.redirection.json

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43698,6 +43698,56 @@
4369843698
"redirect_url": "/training/modules/microsoft-defender-cloud-threat-protection/34-summary",
4369943699
"redirect_document_id": false
4370043700
},
43701+
{
43702+
"source_path": "learn-pr/paths/rust-first-steps/index.yml",
43703+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43704+
"redirect_document_id": false
43705+
},
43706+
{
43707+
"source_path": "learn-pr/language/rust-automated-tests/0-introduction.yml",
43708+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43709+
"redirect_document_id": false
43710+
},
43711+
{
43712+
"source_path": "learn-pr/language/rust-automated-tests/1-unit-tests.yml",
43713+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43714+
"redirect_document_id": false
43715+
},
43716+
{
43717+
"source_path": "learn-pr/language/rust-automated-tests/2-exercise-unit-tests.yml",
43718+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43719+
"redirect_document_id": false
43720+
},
43721+
{
43722+
"source_path": "learn-pr/language/rust-automated-tests/3-documentation-tests.yml",
43723+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43724+
"redirect_document_id": false
43725+
},
43726+
{
43727+
"source_path": "learn-pr/language/rust-automated-tests/4-exercise-documentation-tests.yml",
43728+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43729+
"redirect_document_id": false
43730+
},
43731+
{
43732+
"source_path": "learn-pr/language/rust-automated-tests/5-integration-tests.yml",
43733+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43734+
"redirect_document_id": false
43735+
},
43736+
{
43737+
"source_path": "learn-pr/language/rust-automated-tests/6-knowledge-check.yml",
43738+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43739+
"redirect_document_id": false
43740+
},
43741+
{
43742+
"source_path": "learn-pr/language/rust-automated-tests/7-summary.yml",
43743+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43744+
"redirect_document_id": false
43745+
},
43746+
{
43747+
"source_path": "learn-pr/language/rust-automated-tests/index.yml",
43748+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43749+
"redirect_document_id": false
43750+
},
4370143751
{
4370243752
"source_path": "learn-pr/language/rust-create-command-line-program/1-introduction.yml",
4370343753
"redirect_url": "https://learn.microsoft.com/training/browse/",

learn-pr/achievements.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5270,3 +5270,13 @@ achievements:
52705270
title: Create your first Rust program
52715271
summary: Learn about Rust concepts, including variables, data types, and functions.
52725272
iconUrl: /training/achievements/rust-understand-common-concepts.svg
5273+
- uid: learn.languages.rust-first-steps.trophy
5274+
type: trophy
5275+
title: Take your first steps with Rust
5276+
summary: Interested in learning a new programming language that's growing in use and popularity? Start here! Lay the foundation of knowledge you need to build fast and effective programs in Rust.
5277+
iconUrl: /training/achievements/take-your-first-steps-with-rust.svg
5278+
- uid: learn.language.rust-automated-tests.badge
5279+
type: badge
5280+
title: Write automated tests
5281+
summary: Learn about the types of testing you can do with Rust.
5282+
iconUrl: /training/achievements/rust-automated-tests.svg

learn-pr/azure/azure-vmware-solution/includes/7-exercise-create-firewall.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
Use the following instructions to create and configure Azure Firewall and Route Table.
1+
> [!IMPORTANT]
2+
3+
> Try our Secure Outbound Internet Connectivity click-through demo. This demo shows how to use Azure vNET with Route Server, a network virtual appliance (NVA), and Azure Firewall to inspect and manage traffic originating from Azure VMware Solution and heading to the internet. [Try now](https://regale.cloud/microsoft/play/4174/secure-outbound-internet-connectivity#/0/0)
4+
5+
Use the following instructions to create and configure Azure Firewall and Route Table.
26

37
## Deploy Azure Firewall
48

learn-pr/azure/deploy-disaster-recovery-vmware-srm-azure-vmware-solution/includes/3-install-srm-azure-vmware-solution.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ The solution architecture depicts the following configuration:
1616

1717
- Secondary Azure VMware Solution is deployed in the secondary region.
1818

19+
> [!IMPORTANT]
20+
21+
> Try our VMware Site Recovery Manager click-through demo. This demo shows how an organization can confidently implement disaster recovery for on-premises VMware vSphere virtual machines (VMs) or Azure VMware Solution-based VMs. [Try now](https://regale.cloud/Microsoft/play/3245/vmware-site-recovery-manager-srm#/0/0)
22+
1923
## Deployment workflow for Azure VMware Solution
2024

2125
To deploy Azure VMware Solution in your test environment, you must perform the following steps:

learn-pr/azure/deploy-disaster-recovery-vmware-srm-azure-vmware-solution/includes/4-install-vsphere-replication-appliance.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ The vSphere Replication appliance provides the following components for the prot
1212
- A vSphere Replication management server that manages replications.
1313
- A vSphere Replication server that provides the core of the vSphere Replication infrastructure.
1414

15+
> [!IMPORTANT]
16+
17+
> Try our VMware Site Recovery Manager click-through demo. This demo shows how an organization can confidently implement disaster recovery for on-premises VMware vSphere virtual machines (VMs) or Azure VMware Solution-based VMs. [Try now](https://regale.cloud/Microsoft/play/3245/vmware-site-recovery-manager-srm#/0/0)
18+
1519
## Install vSphere Replication appliance
1620

1721
Use the following procedure to enable the add-on in Azure VMware Solution:

learn-pr/azure/migrate-vmware-workloads-on-premises-azure-vmware-solution/includes/6-migrate-vm-workloads.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ VMware HCX provides several ways of migrating VMs running Windows Server and Lin
66

77
One last thing to note is that taking snapshots of a VM during migration, either manually or via a third-party backup solution, can disrupt the migration process. To prevent any disruption, disable backups until the VM completely migrates into Azure VMware Solution.
88

9+
> [!IMPORTANT]
10+
11+
> Try our HCX migration click-through demo. This demo shows how an organization can confidently migrate workloads from an on-premises VMware deployment to a private cloud in Microsoft Azure. [Try now](https://regale.cloud/Microsoft/play/3210/hcx-migration#/0/0)
12+
13+
914
### Steps to migrate virtual machines into Azure VMware Solution using Bulk Migration
1015

1116
1. From within the HCX dashboard on-premises, select **Services** > **Migration**.

learn-pr/language/rust-automated-tests/0-introduction.yml

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

learn-pr/language/rust-automated-tests/1-unit-tests.yml

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

learn-pr/language/rust-automated-tests/2-exercise-unit-tests.yml

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

learn-pr/language/rust-automated-tests/3-documentation-tests.yml

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

0 commit comments

Comments
 (0)