Merge pull request #71607 from ktoliver/merge-conflicts-sync-030421

Resolve merge conflicts for repo sync 030421

Author: ktoliver

articles/azure-cache-for-redis/cache-best-practices.md

@@ -69,8 +69,6 @@ If you would like to test how your code works under error conditions, consider u
  * The client VM used for testing should be **in the same region** as your Redis cache instance.
  * **We recommend using Dv2 VM Series** for your client as they have better hardware and will give the best results.
  * Make sure the client VM you use has **at least as much compute and bandwidth* as the cache being tested. 
- * **Test under failover conditions** on your cache. It's important to ensure that you don't performance test your cache only under steady state conditions. Also test under failover conditions and measure the CPU / Server Load on your cache during that time. You can initiate a failover by [rebooting the primary node](cache-administration.md#reboot). This will allow you to see how your application behaves in terms of throughput and latency during failover conditions (happens during updates and can happen during an unplanned event). Ideally you dont't want to see CPU / Server Load peak to more than say 80% even during a failover as that can affect performance.
- * **Premium P2 and above** are hosted on VMs with 4 or more cores. This is useful to distribute the TLS encryption / decryption workload across multiple cores to bring down overall CPU usage.  [See here for details around VM sizes and cores](cache-planning-faq.md#azure-cache-for-redis-performance)
  * **Enable VRSS** on the client machine if you are on Windows.  [See here for details](/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/dn383582(v=ws.11)).  Example PowerShell script:
      >PowerShell -ExecutionPolicy Unrestricted Enable-NetAdapterRSS -Name (    Get-NetAdapter).Name 
 
@@ -90,4 +88,4 @@ Test GET requests using a 1k payload.
 
 **To test throughput:**
 Pipelined GET requests with 1k payload.
-> redis-benchmark -h yourcache.redis.cache.windows.net -a yourAccesskey -t  GET -n 1000000 -d 1024 -P 50  -c 50
+> redis-benchmark -h yourcache.redis.cache.windows.net -a yourAccesskey -t  GET -n 1000000 -d 1024 -P 50  -c 50

articles/communication-services/quickstarts/chat/includes/chat-csharp.md

@@ -107,7 +107,7 @@ Use `SendMessage` to send a message to a thread.
 - Use `senderDisplayName` to specify the display name of the sender. If not specified, empty string will be set.
 
 ```csharp
-var messageId = await chatThreadClient.SendMessageAsync(content:"hello world");
+var messageId = await chatThreadClient.SendMessageAsync(content:"hello world", type: );
 ```
 ## Get a message
 

articles/virtual-machines/troubleshooting/troubleshoot-bitlocker-boot-error.md

@@ -54,10 +54,11 @@ If this method does not the resolve the problem, follow these steps to restore t
     $osDiskName = "ProblemOsDisk"
     # Set the EncryptionSettingsEnabled property to false, so you can attach the disk to the recovery VM.
     New-AzDiskUpdateConfig -EncryptionSettingsEnabled $false |Update-AzDisk -diskName $osDiskName -ResourceGroupName $rgName
-    $osDisk = Get-AzDisk -ResourceGroupName $rgName -DiskName $osDiskName;
 
     $recoveryVMName = "myRecoveryVM" 
     $recoveryVMRG = "RecoveryVMRG" 
+    $OSDisk = Get-AzDisk -ResourceGroupName $rgName -DiskName $osDiskName;
+
     $vm = get-AzVM -ResourceGroupName $recoveryVMRG -Name $recoveryVMName 
 
     Add-AzVMDataDisk -VM $vm -Name $osDiskName -ManagedDiskId $osDisk.Id -Caching None -Lun 3 -CreateOption Attach