Skip to content

Commit b4219dd

Browse files
WilliamDAssafMSFTWilliamDAssafMSFT
committed
20210601 1707 resolve merge conflict
2 parents 9ab487e + 75767f1 commit b4219dd

354 files changed

Lines changed: 2690 additions & 1147 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎azure-sql/accelerated-database-recovery.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ title: Accelerated database recovery
33
titleSuffix: Azure SQL
44
description: Accelerated database recovery provides fast and consistent database recovery, instantaneous transaction rollback, and aggressive log truncation for databases in the Azure SQL portfolio.
55
ms.service: sql-database
6-
ms.subservice: high-availability
6+
ms.subservice: backup-restore
77
ms.custom: sqldbrb=4
88
ms.devlang:
99
ms.topic: conceptual
10-
author: stevestein
11-
ms.author: sstein
12-
ms.reviewer:
10+
author: kfarlee
11+
ms.author: kfarlee
12+
ms.reviewer: mathoma
1313
ms.date: 05/19/2020
1414
---
1515
# Accelerated Database Recovery in Azure SQL

‎azure-sql/azure-hybrid-benefit.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ titleSuffix: Azure SQL Database & SQL Managed Instance
44
description: Use existing SQL Server licenses for Azure SQL Database and SQL Managed Instance discounts.
55
services: sql-database
66
ms.service: sql-db-mi
7-
ms.subservice: features
7+
ms.subservice: service-overview
88
ms.custom: sqldbrb=4
99
ms.topic: conceptual
10-
author: stevestein
11-
ms.author: sstein
10+
author: MashaMSFT
11+
ms.author: mathoma
1212
ms.reviewer: sashan, moslake
1313
ms.date: 02/16/2021
1414
---

‎azure-sql/azure-sql-iaas-vs-paas-what-is-overview.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ title: "What is Azure SQL?"
33
description: "Learn about the different options within the Azure SQL family of services: Azure SQL Database, Azure SQL Managed Instance, and SQL Server on Azure VM."
44
services: sql-database
55
ms.service: sql-database
6-
ms.subservice: service
6+
ms.subservice: service-overview
77
ms.custom: sqldbrb=4
88
ms.devlang:
99
ms.topic: overview
1010
keywords: SQL Server cloud, SQL Server in the cloud, PaaS database, cloud SQL Server, DBaaS, IaaS
11-
author: stevestein
12-
ms.author: sstein
11+
author: MashaMSFT
12+
ms.author: mathoma
1313
ms.reviewer:
1414
ms.date: 07/27/2020
1515
---

‎azure-sql/database/active-geo-replication-configure-portal.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ ms.subservice: high-availability
77
ms.custom: sqldbrb=1
88
ms.devlang:
99
ms.topic: tutorial
10-
author: anosov1960
11-
ms.author: sashan
12-
ms.reviewer: mathoma, sstein
10+
author: BustosMSFT
11+
ms.author: robustos
12+
ms.reviewer: mathoma
1313
ms.date: 02/13/2019
1414
---
1515
# Tutorial: Configure active geo-replication and failover in the Azure portal (Azure SQL Database)

‎azure-sql/database/active-geo-replication-overview.md‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ ms.subservice: high-availability
77
ms.custom: sqldbrb=1
88
ms.devlang:
99
ms.topic: conceptual
10-
author: anosov1960
11-
ms.author: sashan
12-
ms.reviewer: mathoma, sstein
10+
author: BustosMSFT
11+
ms.author: robustos
12+
ms.reviewer: mathoma
1313
ms.date: 04/28/2021
1414
---
1515

@@ -19,8 +19,11 @@ ms.date: 04/28/2021
1919
Active geo-replication is an Azure SQL Database feature that allows you to create readable secondary databases of individual databases on a server in the same or different data center (region).
2020

2121
> [!NOTE]
22-
> Active geo-replication for Azure SQL Hyperscale [is now in public preview](https://aka.ms/hsgeodr). Current limitations include: only one geo-secondary in the same or a different region, only forced failover supported, restore database from geo-secondary not supported, using a geo-secondary as the source database for Database Copy, or as the primary for another geo-secondary is not supported.
23-
22+
> Active geo-replication for Azure SQL Hyperscale is [now in public preview](https://aka.ms/hsgeodr). Current limitations include: only one geo-secondary in the same or a different region, forced and planned failover not currently supported, restore database from geo-secondary not supported, using a geo-secondary as the source database for Database Copy, or as the primary for another geo-secondary is not supported.
23+
> In the case you need to make the geo secondary writable, you can do so by breaking the geo-replication link with the steps below:
24+
> 1. Make the secondary database a read-write standalone database using the cmdlet [Remove-AzSqlDatabaseSecondary](/powershell/module/az.sql/remove-azsqldatabasesecondary). Any data changes committed to the primary but not yet replicated to the secondary will be lost. These changes could be recovered when the old primary is available, or in some cases by restoring the old primary to the latest available point in time.
25+
> 2. If the old primary is available, delete it, then set up geo-replication for the new primary (a new secondary will be seeded).
26+
> 3. Update connection strings in your application accordingly.
2427
2528
> [!NOTE]
2629
> Active geo-replication is not supported by Azure SQL Managed Instance. For geographic failover of instances of SQL Managed Instance, use [Auto-failover groups](auto-failover-group-overview.md).

‎azure-sql/database/active-geo-replication-security-configure.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ ms.subservice: high-availability
77
ms.custom: sqldbrb=1
88
ms.devlang:
99
ms.topic: how-to
10-
author: anosov1960
11-
ms.author: sashan
12-
ms.reviewer: mathoma, sstein
10+
author: BustosMSFT
11+
ms.author: robustos
12+
ms.reviewer: mathoma
1313
ms.date: 12/18/2018
1414
---
1515
# Configure and manage Azure SQL Database security for geo-restore or failover

‎azure-sql/database/adonet-v12-develop-direct-route-ports.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ ms.subservice: development
77
ms.custom: "sqldbrb=1, devx-track-dotnet"
88
ms.devlang:
99
ms.topic: reference
10-
author: stevestein
11-
ms.author: sstein
12-
ms.reviewer: genemi
10+
author: VanMSFT
11+
ms.author: vanto
12+
ms.reviewer: mathoma
1313
ms.date: 06/11/2020
1414
---
1515
# Ports beyond 1433 for ADO.NET 4.5

‎azure-sql/database/advance-notifications.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ title: Advance notifications (Preview) for planned maintenance events
33
description: Get notification before planned maintenance for Azure SQL Database.
44
services: sql-database
55
ms.service: sql-db-mi
6-
ms.subservice: service
6+
ms.subservice: service-overview
77
ms.custom:
88
ms.devlang:
99
ms.topic: how-to
10-
author: stevestein
11-
ms.author: sstein
12-
ms.reviewer:
10+
author: scott-kim-sql
11+
ms.author: scottkim
12+
ms.reviewer: mathoma
1313
ms.date: 03/02/2021
1414
---
1515
# Advance notifications for planned maintenance events (Preview)

‎azure-sql/database/alerts-insights-configure-portal.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ ms.subservice: performance
77
ms.custom: sqldbrb=1
88
ms.devlang:
99
ms.topic: how-to
10-
author: aamalvea
11-
ms.author: aamalvea
12-
ms.reviewer: wiassaf, sstein
10+
author: AlainDormehlMSFT
11+
ms.author: aldorme
12+
ms.reviewer: mathoma, wiassaf
1313
ms.date: 05/04/2020
1414
---
1515
# Create alerts for Azure SQL Database and Azure Synapse Analytics using the Azure portal

‎azure-sql/database/always-encrypted-azure-key-vault-configure.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ keywords: data encryption, encryption key, cloud encryption
55
services: sql-database
66
ms.service: sql-database
77
ms.subservice: security
8-
ms.custom: sqldbrb=1, devx-track-azurecli
8+
ms.custom: sqldbrb=1, devx-track-azurecli, devx-track-azurepowershell
99
ms.devlang:
1010
ms.topic: how-to
1111
author: VanMSFT

0 commit comments

Comments
 (0)