Skip to content

Commit 0403e05

Browse files
authored
Merge pull request #291944 from MicrosoftDocs/main
Publish to live, Friday 4 AM PST, 12/13
2 parents e0c05a1 + b2bbe2f commit 0403e05

17 files changed

+236
-299
lines changed
-6.48 KB
Loading
36.1 KB
Loading
-362 Bytes
Loading
606 Bytes
Loading
15 KB
Loading
12.9 KB
Loading

articles/app-service/tutorial-java-jboss-mysql-app.md

Lines changed: 89 additions & 49 deletions
Large diffs are not rendered by default.

articles/backup/backup-azure-enhanced-soft-delete-about.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Overview of enhanced soft delete for Azure Backup
33
description: This article gives an overview of enhanced soft delete for Azure Backup.
44
ms.topic: overview
55
ms.custom: references_regions
6-
ms.date: 12/12/2024
6+
ms.date: 12/13/2024
77
ms.service: azure-backup
88
author: AbhishekMallick-MS
99
ms.author: v-abhmallick
@@ -49,7 +49,6 @@ The key benefits of enhanced soft delete are:
4949

5050
- Enhanced soft delete is supported for Recovery Services vaults and Backup vaults. Also, it's supported for new and existing vaults.
5151
- Enhanced soft delete applies to all vaulted workloads alike and is supported for Recovery Services vaults and Backup vaults. However, for Operational tier workloads, such as operational backup of [Azure Files](azure-file-share-backup-overview.md?tabs=snapshot#architecture-for-azure-file-share-backup), [Azure Blobs](blob-backup-overview.md?tabs=operational-backup#how-the-azure-blobs-backup-works), [Azure Disks](disk-backup-overview.md), soft delete won't be completely applicable as you can delete the underlying storage account that is part of your own subscription.
52-
- Always-on feature for soft delete is currently not supported for SQL database backups.
5352

5453
## States of soft delete settings
5554

articles/data-factory/connector-azure-database-for-postgresql.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: jianleishen
77
ms.subservice: data-movement
88
ms.topic: conceptual
99
ms.custom: synapse
10-
ms.date: 01/05/2024
10+
ms.date: 11/19/2024
1111
---
1212

1313
# Copy and transform data in Azure Database for PostgreSQL using Azure Data Factory or Synapse Analytics
@@ -160,6 +160,7 @@ To copy data from Azure Database for PostgreSQL, set the source type in the copy
160160
|:--- |:--- |:--- |
161161
| type | The type property of the copy activity source must be set to **AzurePostgreSqlSource** | Yes |
162162
| query | Use the custom SQL query to read data. For example: `SELECT * FROM mytable` or `SELECT * FROM "MyTable"`. Note in PostgreSQL, the entity name is treated as case-insensitive if not quoted. | No (if the tableName property in the dataset is specified) |
163+
| queryTimeout | The wait time before terminating the attempt to execute a command and generating an error, default is 120 minutes. If parameter is set for this property, allowed values are timespan, such as "02:00:00" (120 minutes). For more information, see [CommandTimeout](https://www.npgsql.org/doc/api/Npgsql.NpgsqlCommand.html#Npgsql_NpgsqlCommand_CommandTimeout). | No |
163164
| partitionOptions | Specifies the data partitioning options used to load data from Azure SQL Database. <br>Allowed values are: **None** (default), **PhysicalPartitionsOfTable**, and **DynamicRange**.<br>When a partition option is enabled (that is, not `None`), the degree of parallelism to concurrently load data from an Azure SQL Database is controlled by the [`parallelCopies`](copy-activity-performance-features.md#parallel-copy) setting on the copy activity. | No |
164165
| partitionSettings | Specify the group of the settings for data partitioning. <br>Apply when the partition option isn't `None`. | No |
165166
| ***Under `partitionSettings`:*** | | |
@@ -190,7 +191,8 @@ To copy data from Azure Database for PostgreSQL, set the source type in the copy
190191
"typeProperties": {
191192
"source": {
192193
"type": "AzurePostgreSqlSource",
193-
"query": "<custom query e.g. SELECT * FROM mytable>"
194+
"query": "<custom query e.g. SELECT * FROM mytable>",
195+
"queryTimeout": "00:10:00"
194196
},
195197
"sink": {
196198
"type": "<sink type>"

articles/data-factory/connector-deprecation-plan.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.service: azure-data-factory
77
ms.subservice: data-movement
88
ms.topic: concept-article
99
ms.custom: references_regions
10-
ms.date: 11/18/2024
10+
ms.date: 12/10/2024
1111
---
1212

1313
# Upgrade plan for Azure Data Factory connectors
@@ -21,15 +21,15 @@ This article describes future upgrades for some connectors of Azure Data Factory
2121

2222
| Connector|Upgrade Guidance|Release stage |End of Support Date |Disabled Date |
2323
|:-- |:-- |:-- |:-- | :-- |
24-
| [Google BigQuery (legacy)](connector-google-bigquery-legacy.md)  | [Link](connector-google-bigquery.md#upgrade-the-google-bigquery-linked-service) |End of support announced and new version available | October 31, 2024 | / |
25-
| [MariaDB (legacy driver version)](connector-mariadb.md)  | [Link](connector-mariadb.md#upgrade-the-mariadb-driver-version) | End of support announced and new version available | October 31, 2024 | /|
26-
| [MySQL (legacy driver version)](connector-mysql.md)  | [Link](connector-mysql.md#upgrade-the-mysql-driver-version) | End of support announced and new version available | October 31, 2024| /|
27-
| [Salesforce (legacy)](connector-salesforce-legacy.md)   | [Link](connector-salesforce.md#upgrade-the-salesforce-linked-service) | End of support announced and new version available | To be determined | /|
28-
| [Salesforce Service Cloud (legacy)](connector-salesforce-service-cloud-legacy.md)   | [Link](connector-salesforce-service-cloud.md#upgrade-the-salesforce-service-cloud-linked-service) | End of support announced and new version available | To be determined |/ |
29-
| [PostgreSQL (legacy)](connector-postgresql-legacy.md)   | [Link](connector-postgresql.md#upgrade-the-postgresql-linked-service)| End of support announced and new version available |October 31, 2024 | / |
30-
| [ServiceNow (legacy)](connector-servicenow-legacy.md)   | [Link](connector-servicenow.md#upgrade-your-servicenow-linked-service) | End of support announced and new version available | To be determined | / |
31-
| [Snowflake (legacy)](connector-snowflake-legacy.md)   | [Link](connector-snowflake.md#upgrade-the-snowflake-linked-service) | End of support announced and new version available | To be determined | / |
32-
| [Vertica (version 1.0)](connector-vertica.md)| [Link](connector-vertica.md#upgrade-the-vertica-version) | End of support announced and new version available | To be determined | / |
24+
| [Google BigQuery (legacy)](connector-google-bigquery-legacy.md)  | [Link](connector-google-bigquery.md#upgrade-the-google-bigquery-linked-service) |End of support and GA version available | October 31, 2024 | / |
25+
| [MariaDB (legacy driver version)](connector-mariadb.md)  | [Link](connector-mariadb.md#upgrade-the-mariadb-driver-version) | End of support and GA version available | October 31, 2024 | /|
26+
| [MySQL (legacy driver version)](connector-mysql.md)  | [Link](connector-mysql.md#upgrade-the-mysql-driver-version) |End of support and GA version available | October 31, 2024| /|
27+
| [Salesforce (legacy)](connector-salesforce-legacy.md)   | [Link](connector-salesforce.md#upgrade-the-salesforce-linked-service) | GA version available | To be determined | /|
28+
| [Salesforce Service Cloud (legacy)](connector-salesforce-service-cloud-legacy.md)   | [Link](connector-salesforce-service-cloud.md#upgrade-the-salesforce-service-cloud-linked-service) | GA version available | To be determined |/ |
29+
| [PostgreSQL (legacy)](connector-postgresql-legacy.md)   | [Link](connector-postgresql.md#upgrade-the-postgresql-linked-service)| End of support and GA version available |October 31, 2024 | / |
30+
| [ServiceNow (legacy)](connector-servicenow-legacy.md)   | [Link](connector-servicenow.md#upgrade-your-servicenow-linked-service) | GA version available | To be determined | / |
31+
| [Snowflake (legacy)](connector-snowflake-legacy.md)   | [Link](connector-snowflake.md#upgrade-the-snowflake-linked-service) | GA version available | To be determined | / |
32+
| [Vertica (version 1.0)](connector-vertica.md)| [Link](connector-vertica.md#upgrade-the-vertica-version) | Preview version available | To be determined | / |
3333
| [Azure Database for MariaDB](connector-azure-database-for-mariadb.md) |/ | End of support announced |December 31, 2024 | December 31, 2024 |
3434
| [Concur (Preview)](connector-concur.md) |/ | End of support announced | December 31, 2024 | December 31, 2024 |
3535
| [Couchbase (Preview)](connector-couchbase.md) |/ | End of support announced | December 31, 2024 | December 31, 2024 |

0 commit comments

Comments
 (0)