Skip to content

Commit 5397b08

Browse files
ShannonLeavittShannonLeavitt
authored
Merge pull request #101640 from MicrosoftDocs/master
Merge master to live, 4:10 AM
2 parents 2a2af81 + 8a61825 commit 5397b08

File tree

300 files changed

+983
-2062
lines changed

Some content is hidden

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

300 files changed

+983
-2062
lines changed

‎.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11686,6 +11686,11 @@
1168611686
"redirect_url": "/azure/lab-services/devtest-lab-attach-detach-data-disk",
1168711687
"redirect_document_id": false
1168811688
},
11689+
{
11690+
"source_path": "articles/lab-services/devtest-lab-auto-shutdown-vm.md",
11691+
"redirect_url": "/azure/lab-services/devtest-lab-auto-shutdown",
11692+
"redirect_document_id": false
11693+
},
1168911694
{
1169011695
"source_path": "articles/devtest-lab/devtest-lab-comparing-vm-base-image-types.md",
1169111696
"redirect_url": "/azure/lab-services/devtest-lab-comparing-vm-base-image-types",

‎articles/active-directory/develop/sample-v2-code.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ The following samples show public client applications (desktop or mobile applica
7171
| Desktop (WPF) | ![This image shows the .NET/C# logo](media/sample-v2-code/logo_NET.png) | [interactive](msal-authentication-flows.md#interactive)| [dotnet-desktop-msgraph-v2](https://github.com/azure-samples/active-directory-dotnet-desktop-msgraph-v2) | [dotnet-native-aspnetcore-v2](https://aka.ms/msidentity-aspnetcore-webapi) |
7272
| Desktop (Console) | ![This image shows the .NET/C# (Desktop) logo](media/sample-v2-code/logo_NET.png) | [Integrated Windows Authentication](msal-authentication-flows.md#integrated-windows-authentication) | [dotnet-iwa-v2](https://github.com/azure-samples/active-directory-dotnet-iwa-v2) | |
7373
| Desktop (Console) | ![This image shows the .NET/C# (Desktop) logo](media/sample-v2-code/logo_NETcore.png) | [Username/Password](msal-authentication-flows.md#usernamepassword) |[dotnetcore-up-v2](https://github.com/azure-samples/active-directory-dotnetcore-console-up-v2) | |
74-
| Desktop (Console) | ![This image shows the Java logo](media/sample-v2-code/logo_java.png) | [Username/Password](msal-authentication-flows.md#usernamepassword) |[ms-identity-java-desktop](https://github.com/Azure-Samples/ms-identity-java-desktop/tree/master/Call-MsGraph-WithUsernamePassword) | |
75-
| Desktop (Console) | ![This image shows the Python logo](media/sample-v2-code/logo_python.png) | [Username/Password](msal-authentication-flows.md#usernamepassword) |[ms-identity-python-desktop](https://github.com/Azure-Samples/ms-identity-python-desktop/tree/master/2-Call-MsGraph-WithUsernamePassword) | |
74+
| Desktop (Console) | ![This image shows the Java logo](media/sample-v2-code/logo_java.png) | [Username/Password](msal-authentication-flows.md#usernamepassword) |[ms-identity-java-desktop](https://github.com/Azure-Samples/ms-identity-java-desktop/) | |
75+
| Desktop (Console) | ![This image shows the Python logo](media/sample-v2-code/logo_python.png) | [Username/Password](msal-authentication-flows.md#usernamepassword) |[ms-identity-python-desktop](https://github.com/Azure-Samples/ms-identity-python-desktop) | |
7676
| Mobile (Android, iOS, UWP) | ![This image shows the .NET/C# (Xamarin) logo](media/sample-v2-code/logo_xamarin.png) | [interactive](msal-authentication-flows.md#interactive) |[xamarin-native-v2](https://github.com/azure-samples/active-directory-xamarin-native-v2) | |
7777
| Mobile (iOS) | ![This image shows iOS/Objective-C or Swift](media/sample-v2-code/logo_iOS.png) | [interactive](msal-authentication-flows.md#interactive) |[ios-swift-objc-native-v2](https://github.com/azure-samples/active-directory-ios-swift-native-v2) </p> [ios-native-nxoauth2-v2](https://github.com/azure-samples/active-directory-ios-native-nxoauth2-v2) | |
7878
| Desktop (macOS) | macOS | [interactive](msal-authentication-flows.md#interactive) |[macOS-swift-objc-native-v2](https://github.com/Azure-Samples/ms-identity-macOS-swift-objc) | |

‎articles/aks/faq.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
---
22
title: Frequently asked questions for Azure Kubernetes Service (AKS)
33
description: Find answers to some of the common questions about Azure Kubernetes Service (AKS).
4-
services: container-service
54
author: mlearned
6-
manager: jeconnoc
7-
85
ms.service: container-service
9-
ms.topic: article
6+
ms.topic: conceptual
107
ms.date: 10/02/2019
118
ms.author: mlearned
129
---

‎articles/aks/gpu-cluster.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ title: Use GPUs on Azure Kubernetes Service (AKS)
33
description: Learn how to use GPUs for high performance compute or graphics-intensive workloads on Azure Kubernetes Service (AKS)
44
services: container-service
55
author: zr-msft
6-
manager: jeconnoc
7-
86
ms.service: container-service
97
ms.topic: article
108
ms.date: 05/16/2019

‎articles/aks/http-application-routing.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ title: HTTP application routing add-on on Azure Kubernetes Service (AKS)
33
description: Use the HTTP application routing add-on on Azure Kubernetes Service (AKS).
44
services: container-service
55
author: lachie83
6-
manager: jeconnoc
7-
86
ms.service: container-service
97
ms.topic: article
108
ms.date: 08/06/2019

‎articles/aks/integrate-azure.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
---
22
title: Integrate with Azure-managed services using Open Service Broker for Azure (OSBA)
33
description: Integrate with Azure-managed services using Open Service Broker for Azure (OSBA)
4-
services: container-service
54
author: zr-msft
6-
manager: jeconnoc
7-
85
ms.service: container-service
96
ms.topic: overview
107
ms.date: 12/05/2017

‎articles/aks/openfaas.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
---
22
title: Use OpenFaaS with Azure Kubernetes Service (AKS)
33
description: Deploy and use OpenFaaS with Azure Kubernetes Service (AKS)
4-
services: container-service
54
author: justindavies
6-
manager: jeconnoc
7-
85
ms.service: container-service
9-
ms.topic: article
6+
ms.topic: conceptual
107
ms.date: 03/05/2018
118
ms.author: juda
129
ms.custom: mvc

‎articles/aks/spark-job.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
---
22
title: Run an Apache Spark job with Azure Kubernetes Service (AKS)
33
description: Use Azure Kubernetes Service (AKS) to run an Apache Spark job
4-
services: container-service
54
author: lenadroid
6-
manager: jeconnoc
7-
85
ms.service: container-service
9-
ms.topic: article
6+
ms.topic: conceptual
107
ms.date: 10/18/2019
118
ms.author: alehall
129
ms.custom: mvc

‎articles/aks/use-cosmosdb-osba-mongo-app.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
---
22
title: Integrate existing MongoDB application with Azure Cosmos DB API for MongoDB and Open Service Broker for Azure (OSBA)
33
description: In this article, you learn how to integrate an existing Java and MongoDB application with the Azure Cosmos DB API for MongoDB using Open Service Broker for Azure (OSBA).
4-
services: azure-dev-spaces
54
author: zr-msft
6-
manager: jeconnoc
75
ms.service: azure-dev-spaces
8-
ms.topic: article
6+
ms.topic: conceptual
97
ms.date: 01/25/2019
108
ms.author: zarhoads
119
ms.custom: mvc

‎articles/analysis-services/analysis-services-overview.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn about Azure Analysis Services, a fully managed platform as a
44
author: minewiskan
55
ms.service: azure-analysis-services
66
ms.topic: overview
7-
ms.date: 10/30/2019
7+
ms.date: 01/17/2020
88
ms.author: owend
99
ms.reviewer: minewiskan
1010
#Customer intent: As a BI developer, I want to determine if Azure Analysis Services is the best data modeling platform for our organization.
@@ -30,7 +30,7 @@ Azure Analysis Services integrates with many Azure services enabling you to buil
3030

3131
## The right tier when you need it
3232

33-
Azure Analysis Services is available in **Developer**, **Basic**, and **Standard** tiers. Within each tier, plan costs vary according to processing power, QPUs, and memory size. When you create a server, you select a plan within a tier. You can change plans up or down within the same tier, or upgrade to a higher tier, but you can't downgrade from a higher tier to a lower tier.
33+
Azure Analysis Services is available in **Developer**, **Basic**, and **Standard** tiers. Within each tier, plan costs vary according to processing power, Query Processing Units (QPUs), and memory size. When you create a server, you select a plan within a tier. You can change plans up or down within the same tier, or upgrade to a higher tier, but you can't downgrade from a higher tier to a lower tier.
3434

3535
### Developer tier
3636

@@ -43,7 +43,7 @@ This tier is recommended for evaluation, development, and test scenarios. A sing
4343

4444
### Basic tier
4545

46-
The tier is recommended for production solutions with smaller tabular models, limited user concurrency, and simple data refresh requirements. Query replica scale out *is not available* for this tier. Perspectives, multiple partitions, and DirectQuery tabular model features *are not supported* in this tier.
46+
The tier is recommended for production solutions with smaller tabular models, limited user concurrency, and simple data refresh requirements. Query replica scale-out *is not available* for this tier. Perspectives, multiple partitions, and DirectQuery tabular model features *are not supported* in this tier.
4747

4848
|Plan |QPUs |Memory (GB) |
4949
|---------|---------|---------|
@@ -229,7 +229,7 @@ Azure Analysis Services also supports using [Dynamic Management Views (DMVs)](ht
229229

230230
Documentation specific to Azure Analysis Services is included here. Use the table of contents on the left side of your browser screen to find articles.
231231

232-
Because Azure Analysis Services tabular models are much the same as tabular models in SQL Server Analysis Services, there's an extensive library of shared conceptual, procedural, developer, and reference articles in [SQL Server Analysis Services Documentation](https://docs.microsoft.com/analysis-services/analysis-services-overview). Articles in the SQL Server Analysis Services documentation show if they also apply to Azure Analysis Services by an APPLIES TO banner beneath the title.
232+
Because Azure Analysis Services tabular models are much the same as tabular models in SQL Server Analysis Services, there's an extensive library of shared data modeling tutorials, conceptual, procedural, developer, and reference articles in [SQL Server Analysis Services documentation](https://docs.microsoft.com/analysis-services/analysis-services-overview). Articles in the SQL Server Analysis Services documentation show if they also apply to Azure Analysis Services by an APPLIES TO banner beneath the title.
233233

234234
![Shared documentation](./media/analysis-services-overview/aas-overview-applies-to.png)
235235

0 commit comments

Comments
 (0)