Skip to content

Commit 55b5b2a

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into cdnfreshness
2 parents 3839771 + 24127d2 commit 55b5b2a

File tree

6 files changed

+37
-153
lines changed

6 files changed

+37
-153
lines changed

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,16 @@
379379
"redirect_url": "/previous-versions/azure/partner-solutions/logzio/troubleshoot",
380380
"redirect_document_id": false
381381
},
382+
{
383+
"source_path": "articles/security/fundamentals/ocsp-sha-1-sunset.md",
384+
"redirect_url": "/azure/security/fundamentals/azure-CA-details",
385+
"redirect_document_id": false
386+
},
387+
{
388+
"source_path": "articles/security/fundamentals/tls-certificate-changes.md",
389+
"redirect_url": "/azure/security/fundamentals/azure-CA-details",
390+
"redirect_document_id": false
391+
},
382392
{
383393
"source_path": "articles/event-grid/event-schema-storage-actions.md",
384394
"redirect_url": "/azure/storage-actions/overview",

articles/security/fundamentals/azure-CA-details.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.service: security
66
ms.subservice: security-fundamentals
77
ms.custom: devx-track-extended-java
88
ms.topic: conceptual
9-
ms.date: 02/15/2025
9+
ms.date: 03/31/2025
1010
ms.author: sarahlipsey
1111
author: shlipsey3
1212
manager: femila
@@ -247,9 +247,9 @@ To determine if the **Microsoft ECC Root Certificate Authority 2017** and **Micr
247247
248248
## Past changes
249249
250-
The CA/Browser Forum updated the Baseline Requirements to require all publicly trusted Public Key Infrastructures (PKIs) to end usage of the SHA-1 hash algorithms for Online Certificate Standard Protocol (OCSP) on May 31, 2022. Microsoft updated all remaining OCSP Responders that used the SHA-1 hash algorithm to use the SHA-256 hash algorithm. View the [Sunset for SHA-1 OCSP signing article](../fundamentals/ocsp-sha-1-sunset.md) for additional information.
250+
The CA/Browser Forum updated the Baseline Requirements to require all publicly trusted Public Key Infrastructures (PKIs) to end usage of the SHA-1 hash algorithms for Online Certificate Standard Protocol (OCSP) on May 31, 2022. Microsoft updated all remaining OCSP Responders that used the SHA-1 hash algorithm to use the SHA-256 hash algorithm.
251251
252-
Microsoft updated Azure services to use TLS certificates from a different set of Root Certificate Authorities (CAs) on February 15, 2021, to comply with changes set forth by the CA/Browser Forum Baseline Requirements. Some services finalized these updates in 2022. View the [Azure TLS certificate changes article](../fundamentals/tls-certificate-changes.md) for additional information.
252+
Microsoft updated Azure services to use TLS certificates from a different set of Root Certificate Authorities (CAs) on February 15, 2021, to comply with changes set forth by the CA/Browser Forum Baseline Requirements. Some services finalized these updates in 2022.
253253
254254
### Article change log
255255

articles/security/fundamentals/ocsp-sha-1-sunset.md

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

articles/security/fundamentals/tls-certificate-changes.md

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

articles/storage/elastic-san/TOC.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ items:
4646
href: ../container-storage/use-container-storage-with-elastic-san.md?toc=/azure/storage/elastic-san/toc.json&bc=/azure/storage/elastic-san/breadcrumb/toc.json
4747
- name: Use Kubernetes iSCSI CSI driver
4848
href: elastic-san-connect-aks.md
49+
- name: Deploy and configure Elastic SAN for SQL Server on Azure VMs
50+
href: /azure/azure-sql/virtual-machines/windows/storage-configuration-azure-elastic-san?toc=/azure/storage/elastic-san/toc.json&bc=/azure/storage/elastic-san/breadcrumb/toc.json
51+
- name: Configure failover cluster instance to use an Elastic SAN volume
52+
href: /azure/azure-sql/virtual-machines/windows/failover-cluster-instance-azure-elastic-san-manually-configure?toc=/azure/storage/elastic-san/toc.json&bc=/azure/storage/elastic-san/breadcrumb/toc.json
4953
- name: Resize an Elastic SAN
5054
href: elastic-san-expand.md
5155
- name: Use volume snapshots

articles/storage/files/migrate-files-between-shares.md

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,45 +9,43 @@ author: khdownie
99
---
1010

1111
# Migrate files from one SMB Azure file share to another
12-
13-
This article describes how to migrate files between SMB Azure file shares. One common reason to do this is if you need to migrate from a standard file share to a premium file share to get increased performance for your application workload.
12+
This article describes how to migrate files between SMB file shares hosted in Azure Files. You can use this method to migrate between HDD and SSD file shares, file shares using a different billing model, or file shares in different regions.
1413

1514
> [!WARNING]
1615
> If you're using Azure File Sync, the migration process is different than described in this article. Instead, see [Migrate files from one Azure file share to another when using Azure File Sync](../file-sync/file-sync-share-to-share-migration.md).
1716
1817
## Applies to
19-
20-
| File share type | SMB | NFS |
21-
|-|:-:|:-:|
22-
| Standard file shares (GPv2), LRS/ZRS | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
23-
| Standard file shares (GPv2), GRS/GZRS | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
24-
| Premium file shares (FileStorage), LRS/ZRS | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
18+
| Management model | Billing model | Media tier | Redundancy | SMB | NFS |
19+
|-|-|-|-|:-:|:-:|
20+
| Microsoft.Storage | Provisioned v2 | HDD (standard) | Local (LRS) | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
21+
| Microsoft.Storage | Provisioned v2 | HDD (standard) | Zone (ZRS) | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
22+
| Microsoft.Storage | Provisioned v2 | HDD (standard) | Geo (GRS) | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
23+
| Microsoft.Storage | Provisioned v2 | HDD (standard) | GeoZone (GZRS) | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
24+
| Microsoft.Storage | Provisioned v1 | SSD (premium) | Local (LRS) | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
25+
| Microsoft.Storage | Provisioned v1 | SSD (premium) | Zone (ZRS) | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
26+
| Microsoft.Storage | Pay-as-you-go | HDD (standard) | Local (LRS) | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
27+
| Microsoft.Storage | Pay-as-you-go | HDD (standard) | Zone (ZRS) | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
28+
| Microsoft.Storage | Pay-as-you-go | HDD (standard) | Geo (GRS) | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
29+
| Microsoft.Storage | Pay-as-you-go | HDD (standard) | GeoZone (GZRS) | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
2530

2631
## Migrate using Robocopy
32+
Follow these steps to migrate using Robocopy, a command-line file copy utility included with Windows.
2733

28-
Follow these steps to migrate using Robocopy, a command-line file copy utility that's built into Windows.
34+
1. Deploy a Windows virtual machine (VM) in Azure in the same region as your source file share. Keeping the data and networking in Azure is faster and avoids outbound data transfer charges. For optimal performance, we recommend a multi-core VM type with at least 56 GiB of memory, for example **Standard_DS5_v2**.
2935

30-
1. Deploy a Windows virtual machine (VM) in Azure in the same region as your source file share. Keeping the data and networking in Azure will be fast and avoid outbound data transfer charges. For optimal performance, we recommend a multi-core VM type with at least 56 GiB of memory, for example **Standard_DS5_v2**.
36+
2. Mount both the source and target file shares to the VM. Be sure to mount them using the storage account key to make sure the VM has access to all the files. Don't use a domain identity.
3137

32-
1. Mount both the source and target file shares to the VM. Be sure to mount them using the storage account key to make sure the VM has access to all the files. Don't use a domain identity.
33-
34-
1. Run this command at the Windows command prompt. Optionally, you can include flags for logging features as a best practice (/NP, /NFL, /NDL, /UNILOG).
35-
36-
```console
37-
robocopy <source> <target> /MIR /COPYALL /MT:16 /R:2 /W:1 /B /IT /DCOPY:DAT
38-
```
39-
40-
If your source share was mounted as s:\ and target was t:\ the command looks like this:
38+
3. Run this command at the Windows command prompt. Optionally, you can include flags for logging features as a best practice (/NP, /NFL, /NDL, /UNILOG). Remember to replace `s:\` and `t:\` with the paths to the mounted source and target shares as appropriate.
4139

4240
```console
4341
robocopy s:\ t:\ /MIR /COPYALL /MT:16 /R:2 /W:1 /B /IT /DCOPY:DAT
4442
```
4543

46-
You can run the command while your source is still online, but be aware that any I/O will work against the throttle limits on your existing share.
44+
You can run the command while your source is still online, but IOPS and throughput used for the robocopy job counts against your file share limits.
4745

48-
1. After the initial run completes, disconnect your application from the existing share and run the same robocopy command again. This will copy over all the changes that happened since the initial run, skipping any file data that has already copied over.
46+
4. After the initial run completes, run the same robocopy command again to copy over all the changes that happened since the initial run. Any data unchanged since the last copy job is skipped.
4947

50-
1. After the command completes for the second time, you can redirect your application to the new share.
48+
5. You can repeat step 4 as many times as you would like before cutting over to the new file share.
5149

5250
## See also
5351

0 commit comments

Comments
 (0)