Skip to content

Commit 973dd5e

Browse files
authored
Merge pull request #97323 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 3ac54a1 + 732f0a1 commit 973dd5e

File tree

7 files changed

+33
-25
lines changed

7 files changed

+33
-25
lines changed

articles/active-directory/saas-apps/jiramicrosoft-tutorial.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ To get started, you need the following items:
5757

5858
## Supported versions of JIRA
5959

60-
* JIRA Core and Software: 6.4 to 8.2.4
61-
* JIRA Service Desk 3.0.0 to 4.2.1
60+
* JIRA Core and Software: 6.4 to 8.5.1
61+
* JIRA Service Desk 3.0.0 to 4.5.1
6262
* JIRA also supports 5.2. For more details, click [Microsoft Azure Active Directory single sign-on for JIRA 5.2](jira52microsoft-tutorial.md)
6363

6464
> [!NOTE]

articles/cosmos-db/create-sql-api-dotnet.md

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -358,20 +358,17 @@ private async Task AddItemsToContainerAsync()
358358
IsRegistered = false
359359
};
360360

361-
try
362-
{
363-
// Read the item to see if it exists. ReadItemAsync will throw an exception if the item does not exist and return status code 404 (Not found).
364-
ItemResponse<Family> andersenFamilyResponse = await this.container.ReadItemAsync<Family>(andersenFamily.Id, new PartitionKey(andersenFamily.LastName));
365-
Console.WriteLine("Item in database with id: {0} already exists\n", andersenFamilyResponse.Resource.Id);
366-
}
367-
catch(CosmosException ex) when (ex.StatusCode == HttpStatusCode.NotFound)
368-
{
369-
// Create an item in the container representing the Andersen family. Note we provide the value of the partition key for this item, which is "Andersen"
370-
ItemResponse<Family> andersenFamilyResponse = await this.container.CreateItemAsync<Family>(andersenFamily, new PartitionKey(andersenFamily.LastName));
371-
372-
// Note that after creating the item, we can access the body of the item with the Resource property off the ItemResponse. We can also access the RequestCharge property to see the amount of RUs consumed on this request.
373-
Console.WriteLine("Created item in database with id: {0} Operation consumed {1} RUs.\n", andersenFamilyResponse.Resource.Id, andersenFamilyResponse.RequestCharge);
374-
}
361+
try
362+
{
363+
// Create an item in the container representing the Andersen family. Note we provide the value of the partition key for this item, which is "Andersen".
364+
ItemResponse<Family> andersenFamilyResponse = await this.container.CreateItemAsync<Family>(andersenFamily, new PartitionKey(andersenFamily.LastName));
365+
// Note that after creating the item, we can access the body of the item with the Resource property of the ItemResponse. We can also access the RequestCharge property to see the amount of RUs consumed on this request.
366+
Console.WriteLine("Created item in database with id: {0} Operation consumed {1} RUs.\n", andersenFamilyResponse.Resource.Id, andersenFamilyResponse.RequestCharge);
367+
}
368+
catch (CosmosException ex) when (ex.StatusCode == HttpStatusCode.Conflict)
369+
{
370+
Console.WriteLine("Item in database with id: {0} already exists\n", andersenFamily.Id);
371+
}
375372
}
376373

377374
```

articles/cosmos-db/sql-api-sdk-java.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ The SQL API Java SDK supports synchronous operations. For asynchronous support,
3939

4040
## Release notes
4141

42+
### <a name="2.4.5"/>2.4.5
43+
* Avoiding retry on invalid partition key range error, if user provides pkRangeId.
44+
4245
### <a name="2.4.4"/>2.4.4
4346
* Optimized partition key range cache refreshes.
4447

articles/data-explorer/manage-cluster-horizontal-scaling.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Manual scale is the default setting during cluster creation. The cluster has a s
3636

3737
![Manual scale method](media/manage-cluster-horizontal-scaling/manual-scale-method.png)
3838

39-
### Optimized autoscale
39+
### Optimized autoscale (preview)
4040

4141
Optimized autoscale is the recommended autoscale method. This method optimizes cluster performance and costs. If the cluster approaches a state of under-utilization, it will be scaled in. This action lowers costs but keeps performance level. If the cluster approaches a state of over-utilization, it will be scaled out to maintain optimal performance. To configure Optimized autoscale:
4242

articles/storage/common/storage-auth-aad-msi.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,14 +118,13 @@ Install-Package Azure.Identity
118118
Add the following `using` directives to your code to use the Azure Identity and Azure Storage client libraries.
119119

120120
```csharp
121+
using Azure;
122+
using Azure.Identity;
123+
using Azure.Storage.Blobs;
121124
using System;
122125
using System.IO;
126+
using System.Text;
123127
using System.Threading.Tasks;
124-
using Azure.Identity;
125-
using Azure.Storage;
126-
using Azure.Storage.Sas;
127-
using Azure.Storage.Blobs;
128-
using Azure.Storage.Blobs.Models;
129128
```
130129

131130
To get a token credential that your code can use to authorize requests to Azure Storage, create an instance of the [DefaultAzureCredential](/dotnet/api/azure.identity.defaultazurecredential) class. The following code example shows how to get the authenticated token credential and use it to create a service client object, then use the service client to upload a new blob:
@@ -156,7 +155,7 @@ async static Task CreateBlockBlobAsync(string accountName, string containerName,
156155
await containerClient.UploadBlobAsync(blobName, stream);
157156
}
158157
}
159-
catch (StorageRequestFailedException e)
158+
catch (RequestFailedException e)
160159
{
161160
Console.WriteLine(e.Message);
162161
Console.ReadLine();

articles/stream-analytics/stream-analytics-documentdb-output.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,16 @@ Creating Cosmos DB as an output in Stream Analytics generates a prompt for infor
9393
|Container name | The container name to be used. `MyContainer` is a sample valid input - one container named `MyContainer` must exist. |
9494
|Document ID | Optional. The column name in output events used as the unique key on which insert or update operations must be based. If left empty, all events will be inserted, with no update option.|
9595

96+
Once the Cosmos DB output is configured, it can be used in the query as the target of an [INTO statement](https://docs.microsoft.com/stream-analytics-query/into-azure-stream-analytics). When using a Cosmos DB output as such, [a partition key needs to be set explicitly](https://docs.microsoft.com/azure/stream-analytics/stream-analytics-parallelization#partitions-in-sources-and-sinks). The output record must contain a case-sensitive column named after the partition key in Cosmos DB. To achieve greater parallelization, the statement may require a [PARTITION BY clause](https://docs.microsoft.com/azure/stream-analytics/stream-analytics-parallelization#embarrassingly-parallel-jobs) using the same column.
97+
98+
**Sample query**:
99+
100+
```SQL
101+
SELECT TollBoothId, PartitionId
102+
INTO CosmosDBOutput
103+
FROM Input1 PARTITION BY PartitionId
104+
```
105+
96106
## Error Handling and retries
97107

98108
In the event of a transient failure, service unavailability or throttling while sending events to Cosmos DB, Stream Analytics retries indefinitely to successfully complete the operation. However, there are some failures for which retries are not attempted and they are as follows:

articles/virtual-desktop/app-attach.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,8 +303,7 @@ Before you update the PowerShell scripts, make sure you have the volume GUID of
303303
304304
$packageManager = [Windows.Management.Deployment.PackageManager]::new()
305305
306-
$path = $msixJunction + $parentFolder + $packageName # needed if we do the
307-
pbisigned.vhd
306+
$path = $msixJunction + $parentFolder + $packageName # needed if we do the pbisigned.vhd
308307
309308
$path = ([System.Uri]$path).AbsoluteUri
310309

0 commit comments

Comments
 (0)