Skip to content

Commit ca0e2de

Browse files
authored
Merge pull request #107282 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents dad78d3 + ed396ce commit ca0e2de

File tree

6 files changed

+32
-23
lines changed

6 files changed

+32
-23
lines changed

articles/azure-app-configuration/quickstart-resource-manager.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ Before you can apply key-values to the VM, you must have an existing Azure App C
8282
},
8383
"skuName": {
8484
"type": "string",
85-
"defaultValue": "free",
85+
"defaultValue": "standard",
8686
"metadata": {
8787
"description": "Specifies the SKU of the app configuration store."
8888
}
@@ -329,15 +329,15 @@ Now that you've added key-values to the store, you're ready to deploy a VM using
329329
"imageReference": {
330330
"publisher": "MicrosoftWindowsServer",
331331
"offer": "WindowsServer",
332-
"sku": "[listKeyValue(variables('appConfigRef'), '2019-02-01-preview', variables('windowsOSVersionParameters')).value]",
332+
"sku": "[listKeyValue(variables('appConfigRef'), '2019-10-01', variables('windowsOSVersionParameters')).value]",
333333
"version": "latest"
334334
},
335335
"osDisk": {
336336
"createOption": "FromImage"
337337
},
338338
"dataDisks": [
339339
{
340-
"diskSizeGB": "[listKeyValue(variables('appConfigRef'), '2019-02-01-preview', variables('diskSizeGBParameters')).value]",
340+
"diskSizeGB": "[listKeyValue(variables('appConfigRef'), '2019-10-01', variables('diskSizeGBParameters')).value]",
341341
"lun": 0,
342342
"createOption": "Empty"
343343
}

articles/azure-cache-for-redis/cache-remove-tls-10-11.md

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ There's an industry-wide push toward the exclusive use of Transport Layer Securi
1616

1717
As a part of this effort, we'll be making the following changes to Azure Cache for Redis:
1818

19-
* **Phase 1:** We'll configure the default minimum TLS version to be 1.2 for newly created cache instances. Existing cache instances won't be updated at this point. You'll be allowed to [change the minimum TLS version](cache-configure.md#access-ports) back to 1.0 or 1.1 for backward compatibility, if needed. This change can be done through the Azure portal or other management APIs.
19+
* **Phase 1:** We'll configure the default minimum TLS version to be 1.2 for newly created cache instances. (This used to be TLS 1.0.) Existing cache instances won't be updated at this point. You'll be allowed to [change the minimum TLS version](cache-configure.md#access-ports) back to 1.0 or 1.1 for backward compatibility, if needed. This change can be done through the Azure portal or other management APIs.
2020
* **Phase 2:** We'll stop supporting TLS versions 1.0 and 1.1. After this change, your application will be required to use TLS 1.2 or later to communicate with your cache.
2121

2222
Additionally, as a part of this change, we'll be removing support for older, insecure cypher suites. Our supported cypher suites will be restricted to the following when the cache is configured with a minimum TLS version of 1.2.
@@ -84,21 +84,27 @@ Node Redis and IORedis use TLS 1.2 by default.
8484

8585
### PHP
8686

87-
Predis on PHP 7 won't work because PHP 7 supports only TLS 1.0. On PHP 7.2.1 or earlier, Predis uses TLS 1.0 or 1.1 by default. You can specify TLS 1.2 when you create the client instance:
88-
89-
``` PHP
90-
$redis=newPredis\Client([
91-
'scheme'=>'tls',
92-
'host'=>'host',
93-
'port'=>6380,
94-
'password'=>'password',
95-
'ssl'=>[
96-
'crypto_type'=>STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT,
97-
],
98-
]);
99-
```
100-
101-
On PHP 7.3 or above, Predis uses the latest TLS version.
87+
#### Predis
88+
89+
* Versions earlier than PHP 7: Predis supports only TLS 1.0. These versions don't work with TLS 1.2; you must upgrade to use TLS 1.2.
90+
91+
* PHP 7.0 to PHP 7.2.1: Predis uses only TLS 1.0 or 1.1 by default. You can use the following workaround to use TLS 1.2. Specify TLS 1.2 when you create the client instance:
92+
93+
``` PHP
94+
$redis=newPredis\Client([
95+
'scheme'=>'tls',
96+
'host'=>'host',
97+
'port'=>6380,
98+
'password'=>'password',
99+
'ssl'=>[
100+
'crypto_type'=>STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT,
101+
],
102+
]);
103+
```
104+
105+
* PHP 7.3 and later versions: Predis uses the latest TLS version.
106+
107+
#### PhpRedis
102108

103109
PhpRedis doesn't support TLS on any PHP version.
104110

articles/kinect-dk/body-sdk-download.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ This document provides links to install each version of the Azure Kinect Body Tr
2323

2424
Version | Download
2525
--------------|----------
26+
1.0.1 | [msi](https://www.microsoft.com/en-us/download/details.aspx?id=100942) [nuget](https://www.nuget.org/packages/Microsoft.Azure.Kinect.BodyTracking/1.0.1)
2627
1.0.0 | [msi](https://www.microsoft.com/en-us/download/details.aspx?id=100848) [nuget](https://www.nuget.org/packages/Microsoft.Azure.Kinect.BodyTracking/1.0.0)
2728
0.9.5 | [msi](https://www.microsoft.com/en-us/download/details.aspx?id=100636) [nuget](https://www.nuget.org/packages/Microsoft.Azure.Kinect.BodyTracking/0.9.5)
2829
0.9.4 | [msi](https://www.microsoft.com/en-us/download/details.aspx?id=100415) [nuget](https://www.nuget.org/packages/Microsoft.Azure.Kinect.BodyTracking/0.9.4)
@@ -52,6 +53,9 @@ If the command succeeds, the SDK is ready for use.
5253
5354
## Change log
5455

56+
### v1.0.1
57+
* [Bug Fix] Fix issue that the SDK crashes if loading onnxruntime.dll from path on Windows build 19025 or later: [Link](https://github.com/microsoft/Azure-Kinect-Sensor-SDK/issues/932)
58+
5559
### v1.0.0
5660
* [Feature] Add C# wrapper to the msi installer.
5761
* [Bug Fix] Fix issue that the head rotation cannot be detected correctly: [Link](https://github.com/microsoft/Azure-Kinect-Sensor-SDK/issues/997)

articles/network-watcher/network-watcher-packet-capture-manage-powershell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ Once the preceding steps are complete, the packet capture agent is installed on
123123
The next step is to retrieve the Network Watcher instance. This variable is passed to the `New-AzNetworkWatcherPacketCapture` cmdlet in step 4.
124124

125125
```powershell
126-
$networkWatcher = Get-AzResource | Where {$_.ResourceType -eq "Microsoft.Network/networkWatchers" -and $_.Location -eq "WestCentralUS" }
126+
$networkWatcher = Get-AzResource -ResourceType "Microsoft.Network/networkWatchers" | Where {$_.Location -eq "WestCentralUS" }
127127
```
128128

129129
### Step 2

articles/storage/common/storage-initiate-account-failover.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@ This article shows how to initiate an account failover for your storage account
2525

2626
## Prerequisites
2727

28-
Before you can perform an account failover on your storage account, make sure that you have performed the following steps:
28+
Before you can perform an account failover on your storage account, make sure that you have performed the following step:
2929

30-
- Register for the account failover preview. For information about how to register, see [About the preview](storage-disaster-recovery-guidance.md#about-the-preview).
3130
- Make sure that your storage account is configured to use either geo-redundant storage (GRS) or read-access geo-redundant storage (RA-GRS). For more information about geo-redundant storage, see [Azure Storage redundancy](storage-redundancy.md).
3231

3332
## Important implications of account failover

articles/storage/files/storage-files-identity-auth-active-directory-enable.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ The script would then enable the feature on your storage account. To perform thi
156156
```PowerShell
157157
#Set the feature flag on the target storage account and provide the required AD domain information
158158
159-
Set-AzStorageAccount -ResourceGroupName "<your-resource-group-name-here>" -Name "<your-storage-account-name-here>" -EnableActiveDirectoryDomainServiesForFile $true -ActiveDirectoryDomainName "<your-domain-name-here>" -ActiveDirectoryNetBiosDomainName "<your-netbios-domain-name-here>" -ActiveDirectoryForestName "<your-forest-name-here>" -ActiveDirectoryDomainGuid "<your-guid-here>" -ActiveDirectoryDomainsid "<your-domain-sid-here>" -ActiveDirectoryAzureStorageSid "<your-storage-account-sid>"
159+
Set-AzStorageAccount -ResourceGroupName "<your-resource-group-name-here>" -Name "<your-storage-account-name-here>" -EnableActiveDirectoryDomainServicesForFile $true -ActiveDirectoryDomainName "<your-domain-name-here>" -ActiveDirectoryNetBiosDomainName "<your-netbios-domain-name-here>" -ActiveDirectoryForestName "<your-forest-name-here>" -ActiveDirectoryDomainGuid "<your-guid-here>" -ActiveDirectoryDomainsid "<your-domain-sid-here>" -ActiveDirectoryAzureStorageSid "<your-storage-account-sid>"
160160
```
161161

162162

0 commit comments

Comments
 (0)