Skip to content

Commit c064ba5

Browse files
authored
Merge pull request #49563 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 0806b09 + ee4576f commit c064ba5

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

articles/active-directory/develop/quickstart-v1-openid-connect-code.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ Finally, build and run your app. Run `node app.js`, and then go to `http://local
404404

405405
Sign in with either a personal Microsoft account or a work or school account, and notice how the user's identity is reflected in the /account list. You now have a web app that's secured with industry standard protocols that can authenticate users with both their personal and work/school accounts.
406406

407-
For reference, the completed sample (without your configuration values) [is provided as a .zip file](https://github.com/AzureADQuickStarts/WebApp-OpenIDConnect-NodeJS/archive/complete.zip). Alternatively, you can clone it from GitHub:
407+
For reference, the completed sample (without your configuration values) [is provided as a .zip file](https://github.com/AzureADQuickStarts/WebApp-OpenIDConnect-NodeJS/archive/master.zip). Alternatively, you can clone it from GitHub:
408408

409409
```git clone --branch master https://github.com/AzureADQuickStarts/WebApp-OpenIDConnect-NodeJS.git```
410410

articles/azure-stack/azure-stack-create-and-publish-marketplace-item.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ ms.reviewer: jeffgo
9898

9999
6. You can remove a Marketplace item by using the **Remove-AzureRMGalleryItem** cmdlet. Example:
100100

101-
Remove-AzureRMGalleryItem -Name Microsoft.SimpleTemplate.1.0.0 –Verbose
101+
Remove-AzsGalleryItem -Name Microsoft.SimpleTemplate.1.0.0 –Verbose
102102

103103
> [!NOTE]
104104
> The Marketplace UI may show an error after you remove an item. To fix the error, click **Settings** in the portal. Then, select **Discard modifications** under **Portal customization**.

articles/service-fabric/service-fabric-get-started-mac.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ To set up a local Docker container and have a Service Fabric cluster running on
114114

115115

116116

117-
6. When your done you can stop and cleanup the container with this command:
117+
6. When you are done, stop and cleanup the container with this command:
118118

119119
```bash
120120
docker rm -f sftestcluster

articles/sql-database/sql-database-high-availability.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ The following figure shows four nodes in standard architectural model with the s
3333
In the standard availability model there are two layers:
3434

3535
- A stateless compute layer that is running the sqlserver.exe process and contains only transient and cached data (for example – plan cache, buffer pool, column store pool). This stateless SQL Server node is operated by Azure Service Fabric that initializes process, controls health of the node, and performs failover to another place if necessary.
36-
- A stateful data layer with database files (.mdf/.ldf) that are stored in Azure Premium Storage Disks. Azure Storage guarantees that there will be no data loss of any record that is placed in any database file. Azure Storage has built-in data availability/redundancy that ensures that every record in log file or page in data file will be preserved even if SQL Server process crashes.
36+
- A stateful data layer with database files (.mdf/.ldf) that are stored in Azure Premium Storage. Azure Storage guarantees that there will be no data loss of any record that is placed in any database file. Azure Storage has built-in data availability/redundancy that ensures that every record in log file or page in data file will be preserved even if SQL Server process crashes.
3737

3838
Whenever database engine or operating system is upgraded, some part of underlying infrastructure fails, or if some critical issue is detected in Sql Server process, Azure Service Fabric will move the stateless SQL Server process to another stateless compute node. There is a set of spare nodes that is waiting to run new compute service in case of failover in order to minimize failover time. Data in Azure Storage layer is not affected, and data/log files are attached to newly initialized SQL Server process. Expected failover time can be measured in seconds. This process guarantees 99.99% availability, but it might have some performance impacts on heavy workload that is running due to transition time and the fact the new SQL Server node starts with cold cache.
3939

0 commit comments

Comments
 (0)