Skip to content

Commit 916a832

Browse files
authored
Merge branch 'MicrosoftDocs:main' into heidist-fix
2 parents 1758829 + ffeee79 commit 916a832

File tree

8 files changed

+218
-210
lines changed

8 files changed

+218
-210
lines changed

articles/communication-services/quickstarts/telephony/get-phone-number.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.topic: quickstart
1010
ms.service: azure-communication-services
1111
ms.subservice: pstn
1212
ms.custom: references_regions, mode-other, devx-track-extended-java, devx-track-js, devx-track-python
13-
zone_pivot_groups: acs-azcli-azp-azpnew-java-net-python-csharp-js
13+
zone_pivot_groups: acs-azcli-azp-java-net-python-csharp-js
1414
---
1515

1616
# Quickstart: Get and manage phone numbers
@@ -27,10 +27,6 @@ zone_pivot_groups: acs-azcli-azp-azpnew-java-net-python-csharp-js
2727
[!INCLUDE [Azure portal](./includes/phone-numbers-portal.md)]
2828
::: zone-end
2929

30-
::: zone pivot="platform-azp-new"
31-
[!INCLUDE [Azure portal (new)](./includes/phone-numbers-portal-new.md)]
32-
::: zone-end
33-
3430
::: zone pivot="programming-language-csharp"
3531
[!INCLUDE [Azure portal](./includes/phone-numbers-net.md)]
3632
::: zone-end

articles/communication-services/tutorials/migrating-to-azure-communication-services-calling.md

Lines changed: 129 additions & 132 deletions
Large diffs are not rendered by default.

articles/container-apps/firewall-integration.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@ The following tables describe how to configure a collection of NSG allow rules.
6767

6868
# [Consumption only environment](#tab/consumption-only)
6969

70+
>[!Note]
71+
> When using Consumption only environments, all [outbound ports required by Azure Kubernetes Service](/azure/aks/outbound-rules-control-egress#required-outbound-network-rules-and-fqdns-for-aks-clusters) are also required for your container app.
72+
7073
| Protocol | Source | Source ports | Destination | Destination ports | Description |
7174
|--|--|--|--|--|--|
7275
| TCP | Your container app's subnet<sup>1</sup> | \* | Your Container Registry | Your container registry's port | This is required to communicate with your container registry. For example, when using ACR, you need `AzureContainerRegistry` and `AzureActiveDirectory` for the destination, and the port will be your container registry's port unless using private endpoints.<sup>2</sup> |

articles/data-factory/continuous-integration-delivery-improvements.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,9 @@ Follow these steps to get started:
145145

146146
# Installs Node and the npm packages saved in your package.json file in the build
147147

148-
- task: NodeTool@0
148+
- task: UseNode@1
149149
inputs:
150-
versionSpec: '14.x'
150+
version: '18.x'
151151
displayName: 'Install Node.js'
152152

153153
- task: Npm@1

articles/data-factory/copy-activity-overview.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,11 @@ For other scenarios than binary file copy, copy activity rerun starts from the b
170170

171171
While copying data from source to sink, in scenarios like data lake migration, you can also choose to preserve the metadata and ACLs along with data using copy activity. See [Preserve metadata](copy-activity-preserve-metadata.md) for details.
172172

173+
## Add metadata tags to file based sink
174+
When the sink is Azure Storage based (Azure data lake storage or Azure Blob Storage), we can opt to add some metadata to the files. These metadata will be appearing as part of the file properties as Key-Value pairs.
175+
For all the types of file based sinks, you can add metadata involving dynamic content using the pipeline parameters, system variables, functions and variables.
176+
In addition to this, for binary file based sink, you have the option to add Last Modified datetime (of the source file) using the keyword $$LASTMODIFIED, as well as custom values as a metadata to the sink file.
177+
173178
## Schema and data type mapping
174179

175180
See [Schema and data type mapping](copy-activity-schema-and-type-mapping.md) for information about how the Copy activity maps your source data to your sink.

articles/machine-learning/how-to-create-attach-compute-cluster.md

Lines changed: 51 additions & 56 deletions
Large diffs are not rendered by default.

articles/mysql/migrate/migrate-single-flexible-in-place-auto-migration.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ The in-place migration provides a highly resilient and self-healing offline migr
2424
> [!NOTE]
2525
> In-place migration is only for Single Server database workloads with Basic or GP SKU, data storage used < 10 GiB and no complex features (CMK, AAD, Read Replica, Private Link) enabled. All other Single Server workloads are recommended to use user-initiated migration tooling offered by Azure - Azure DMS, Azure MySQL Import to migrate.
2626
27-
## What's new?
28-
* If you own a Single Server workload with Basic or GP SKU, data storage used <= 20 GiB and no complex features (CMK, AAD, Read Replica, Private Link) enabled, you can now nominate yourself (if not already scheduled by the service) for auto-migration by submitting your server details through this [form](https://forms.office.com/Pages/ResponsePage.aspx?id=v4j5cvGGr0GRqy180BHbR4lhLelkCklCuumNujnaQ-ZUQzRKSVBBV0VXTFRMSDFKSUtLUDlaNTA5Wi4u). (Sept 2023)
27+
## Eligibility
28+
* If you own a Single Server workload with Basic or GP SKU, data storage used <= 20 GiB and no complex features (CMK, AAD, Read Replica, Private Link) enabled, you can now nominate yourself (if not already scheduled by the service) for auto-migration by submitting your server details through this [form](https://forms.office.com/Pages/ResponsePage.aspx?id=v4j5cvGGr0GRqy180BHbR4lhLelkCklCuumNujnaQ-ZUQzRKSVBBV0VXTFRMSDFKSUtLUDlaNTA5Wi4u).
2929

3030
## Configure migration alerts and review migration schedule
3131

articles/synapse-analytics/sql/reference-collation-types.md

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
---
22
title: Collation support
3-
description: Collation types support for Synapse SQL in Azure Synapse Analytics
3+
description: Collation types support for Synapse SQL in Azure Synapse Analytics.
44
author: filippopovic
5-
ms.service: synapse-analytics
6-
ms.topic: reference
7-
ms.subservice: sql
8-
ms.date: 02/15/2023
95
ms.author: fipopovi
106
ms.reviewer: wiassaf, kecona
7+
ms.date: 01/30/2024
8+
ms.service: synapse-analytics
9+
ms.subservice: sql
10+
ms.topic: reference
1111
---
1212

13-
# Database collation support for Synapse SQL in Azure Synapse Analytics
13+
# Database collation support for Synapse SQL in Azure Synapse Analytics
1414

1515
Collations provide the locale, code page, sort order, and character sensitivity rules for character-based data types. Once chosen, all columns and expressions requiring collation information inherit the chosen collation from the database setting. The default inheritance can be overridden by explicitly stating a different collation for a character-based data type.
1616

@@ -37,10 +37,10 @@ The following table shows which collation types are supported by which service.
3737
|:-----------------------------------------:|:-------------------:|:-----------------------:|:------------------:|:------------------:|
3838
| Non-UTF-8 Collations | Yes | Yes | Yes | Yes |
3939
| UTF-8 | Yes | Yes | No | No |
40-
| Japanese_Bushu_Kakusu_140_* | Yes | Yes | No | No |
41-
| Japanese_XJIS_140_* | Yes | Yes | No | No |
42-
| SQL_EBCDIC1141_CP1_CS_AS | No | No | No | No |
43-
| SQL_EBCDIC277_2_CP1_CS_AS | No | No | No | No |
40+
| `Japanese_Bushu_Kakusu_140_*` | Yes | Yes | No | No |
41+
| `Japanese_XJIS_140_*` | Yes | Yes | No | No |
42+
| `SQL_EBCDIC1141_CP1_CS_AS` | No | No | No | No |
43+
| `SQL_EBCDIC277_2_CP1_CS_AS` | No | No | No | No |
4444

4545

4646
## Check the current collation
@@ -53,9 +53,21 @@ SELECT DATABASEPROPERTYEX(DB_NAME(), 'Collation') AS Collation;
5353

5454
When passed 'Collation' as the property parameter, the DatabasePropertyEx function returns the current collation for the database specified. For more information, see [DATABASEPROPERTYEX](/sql/t-sql/functions/databasepropertyex-transact-sql?toc=/azure/synapse-analytics/sql-data-warehouse/toc.json&bc=/azure/synapse-analytics/sql-data-warehouse/breadcrumb/toc.json&view=azure-sqldw-latest&preserve-view=true).
5555

56-
## Next steps
56+
## Check supported collation
57+
58+
To check the list of supported collations in your dedicated SQL pool:
59+
60+
```sql
61+
USE master
62+
GO
63+
SELECT * FROM sys.fn_helpcollations();
64+
```
65+
66+
Run the [sys.fn_helpcollations](/sql/relational-databases/system-functions/sys-fn-helpcollations-transact-sql?view=azure-sqldw-latest&preserve-view=true) function from the `master` database.
67+
68+
## Related content
5769

5870
Additional information on best practices for dedicated SQL pool and serverless SQL pool can be found in the following articles:
5971

60-
- [Best practices for dedicated SQL pool](./best-practices-dedicated-sql-pool.md)
61-
- [Best practices for serverless SQL pool](./best-practices-serverless-sql-pool.md)
72+
- [Best practices for dedicated SQL pools in Azure Synapse Analytics](best-practices-dedicated-sql-pool.md)
73+
- [Best practices for serverless SQL pool in Azure Synapse Analytics](best-practices-serverless-sql-pool.md)

0 commit comments

Comments
 (0)