Skip to content

Commit 4bd2d2b

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into ds-fixlink43
2 parents 3935bf6 + fef30b1 commit 4bd2d2b

14 files changed

+28
-24
lines changed

articles/active-directory/reports-monitoring/reference-sign-ins-error-codes.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ You can also programmatically access the sign-in data using the [reporting API](
140140
|53002|Application used is not an approved application for Conditional Access. User needs to use one of the apps from the list of approved applications to use in order to get access.|
141141
|53003|Access has been blocked due to Conditional Access policies.|
142142
|53004|User needs to complete Multi-factor authentication registration process before accessing this content. User should register for multi-factor authentication.|
143+
|53032|Acount has been blocked due to Azure AD Identity Protection policies.|
143144
|65001|Application X doesn't have permission to access application Y or the permission has been revoked. Or The user or administrator has not consented to use the application with ID X. Send an interactive authorization request for this user and resource. Or The user or administrator has not consented to use the application with ID X. Send an authorization request to your tenant admin to act on behalf of the App : Y for Resource : Z.|
144145
|65004|User declined to consent to access the app. Have the user retry the sign-in and consent to the app|
145146
|65005|The application required resource access list does not contain applications discoverable by the resource or The client application has requested access to resource, which was not specified in its required resource access list or Graph service returned bad request or resource not found. If the application supports SAML, you may have configured the application with the wrong Identifier (Entity). Try out the resolution listed for SAML using the link below: [https://docs.microsoft.com/azure/active-directory/application-sign-in-problem-federated-sso-gallery?/?WT.mc_id=DMC_AAD_Manage_Apps_Troubleshooting_Nav#no-resource-in-requiredresourceaccess-list](https://docs.microsoft.com/azure/active-directory/application-sign-in-problem-federated-sso-gallery?/?WT.mc_id=DMC_AAD_Manage_Apps_Troubleshooting_Nav)|

articles/aks/virtual-nodes-cli.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -314,10 +314,6 @@ az aks disable-addons --resource-group myResourceGroup --name myAKSCluster --add
314314

315315
Now, remove the virtual network resources and resource group:
316316

317-
318-
> [!NOTE]
319-
> If you receive an error while attempting to remove the network profile, allow 3-4 days for the platform to automatically mitigate the issue and attempt the deletion again. If you need to delete a network profile immediately, [open a support request](https://azure.microsoft.com/support/create-ticket/) referencing the Azure Container Instances service.
320-
321317
```azurecli-interactive
322318
# Change the name of your resource group, cluster and network resources as needed
323319
RES_GROUP=myResourceGroup

articles/azure-databricks/TOC.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -888,13 +888,19 @@
888888
- name: Access tracking externally
889889
href: /azure/databricks/applications/mlflow/access-hosted-tracking-server
890890
maintainContext: true
891+
- name: Build dashboards with the MLflow Search API
892+
href: /azure/databricks/applications/mlflow/build-dashboards
893+
maintainContext: true
891894
- name: Save, load, and deploy models
892895
items:
893896
- name: Save, load, and deploy overview
894897
href: /azure/databricks/applications/mlflow/models
895898
maintainContext: true
896-
- name: MLflow model examples
897-
href: /azure/databricks/applications/mlflow/ model-examples
899+
- name: MLflow model example
900+
href: /azure/databricks/applications/mlflow/model-example
901+
maintainContext: true
902+
- name: scikit learn model deployment on Azure
903+
href: /azure/databricks/applications/mlflow/scikit-learn-model-deployment-on-azure-ml
898904
maintainContext: true
899905
- name: Reproduce runs with MLflow projects
900906
href: /azure/databricks/applications/mlflow/projects
@@ -1411,7 +1417,7 @@
14111417
maintainContext: true
14121418
- name: Python
14131419
items:
1414-
- name: Create a cluster with Anaconda
1420+
- name: Create a cluster with Conda
14151421
href: /azure/databricks/kb/python/anaconda-environment
14161422
maintainContext: true
14171423
- name: Install and compile Cython
@@ -1466,6 +1472,9 @@
14661472
- name: Run C++ code in Scala
14671473
href: /azure/databricks/kb/scala/running-c-plus-plus-code-scala
14681474
maintainContext: true
1475+
- name: Concurrent Spark JAR jobs fail
1476+
href: /azure/databricks/kb/scala/spark-jar-job-error
1477+
maintainContext: true
14691478
- name: SQL
14701479
items:
14711480
- name: Table or view not found

articles/container-instances/container-instances-vnet.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -256,10 +256,6 @@ az container delete --resource-group myResourceGroup --name appcontaineryaml -y
256256

257257
### Delete network resources
258258

259-
260-
> [!NOTE]
261-
> If you receive an error while attempting to remove the network profile, allow 3-4 days for the platform to automatically mitigate the issue and attempt the deletion again. If you need to delete a network profile immediately, [open a support request](https://azure.microsoft.com/support/create-ticket/) referencing the Azure Container Instances service.
262-
263259
This feature currently requires several additional commands to delete the network resources you created earlier. If you used the example commands in previous sections of this article to create your virtual network and subnet, then you can use the following script to delete those network resources.
264260

265261
Before executing the script, set the `RES_GROUP` variable to the name of the resource group containing the virtual network and subnet that should be deleted. Update the name of the virtual network if you did not use the `aci-vnet` name suggested earlier. The script is formatted for the Bash shell. If you prefer another shell such as PowerShell or Command Prompt, you'll need to adjust variable assignment and accessors accordingly.

articles/cost-management-billing/reservations/understand-disk-reservations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.devlang: na
77
ms.topic: conceptual
88
ms.tgt_pltfrm: na
99
ms.workload: na
10-
ms.date: 01/13/2020
10+
ms.date: 01/30/2020
1111
ms.author: rogarana
1212
---
1313

articles/hdinsight/create-cluster-error-dictionary.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
---
22
title: Create a cluster error dictionary
33
description: Learn how to create a cluster error dictionary.
4-
ms.reviewer: hrasheed
4+
55
author: karkrish
6+
ms.author: v-todmc
7+
ms.reviewer: hrasheed
68
ms.service: hdinsight
7-
ms.custom: hdinsightactive,hdiseo17may2017
89
ms.topic: troubleshooting
10+
ms.custom: hdinsightactive,hdiseo17may2017
911
ms.date: 11/19/2019
10-
ms.author: v-todmc
1112
---
1213

1314

@@ -206,7 +207,7 @@ Typically, this error is generated when there's a transient problem or an Azure
206207

207208
### Resolution
208209

209-
Check the [Azure status](https://status.azure.com/status) page for any Azure outages that might affect cluster deployment. If there are no outages, retry cluster deployment.
210+
Check the [Azure status](https://status.azure.com) page for any Azure outages that might affect cluster deployment. If there are no outages, retry cluster deployment.
210211

211212
## Next steps
212213

articles/hdinsight/hadoop/hdinsight-troubleshoot-cluster-creation-fails.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ ms.topic: troubleshooting
1010
ms.date: 08/26/2019
1111
#Customer intent: As an HDInsight user, I would like to understand how to resolve common cluster creation failures.
1212
---
13+
1314
# Troubleshoot cluster creation failures with Azure HDInsight
1415

1516
The following issues are most common root causes for cluster creation failures:
@@ -73,7 +74,7 @@ Other naming restrictions also apply for cluster creation. See [Cluster name res
7374

7475
## Service outages
7576

76-
Check [Azure status](https://status.azure.com/status) for any potential outages or service issues.
77+
Check [Azure status](https://status.azure.com) for any potential outages or service issues.
7778

7879
## Next steps
7980

articles/hdinsight/hdinsight-release-notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ The _version.py file on the cluster was updated to 5.x.x instead of 4.4.x.## or
7878

7979
If you create a new Jupyter notebook and receive one of the errors listed above, perform the following steps to fix the issue.
8080

81-
1. Open Ambari in a web browser by going to https://CLUSTERNAME.azurehdinsight.net, where CLUSTERNAME is the name of your cluster.
81+
1. Open Ambari in a web browser by going to `https://CLUSTERNAME.azurehdinsight.net`, where CLUSTERNAME is the name of your cluster.
8282
1. In Ambari, on the left menu, click **Jupyter**, then on **Service Actions**, click **Stop**.
8383
1. ssh into the cluster headnode where the Jupyter service is running.
8484
1. Open the following file /usr/bin/anaconda/lib/python2.7/site-packages/nbformat/_version.py in sudo mode.

articles/hdinsight/spark/apache-spark-eclipse-tool-plugin.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ You can use HDInsight Tools in Azure Toolkit for Eclipse to run Spark Scala appl
237237

238238
While you're running the local Spark Scala application on a Windows computer, you might get an exception as explained in [SPARK-2356](https://issues.apache.org/jira/browse/SPARK-2356). This exception occurs because **WinUtils.exe** is missing in Windows.
239239

240-
To resolve this error, you need [download the executable](https://public-repo-1.hortonworks.com/hdp-win-alpha/winutils.exe) to a location like **C:\WinUtils\bin**, and then add the environment variable **HADOOP_HOME** and set the value of the variable to **C\WinUtils**.
240+
To resolve this error, you need `https://public-repo-1.hortonworks.com/hdp-win-alpha/winutils.exe` to a location like **C:\WinUtils\bin**, and then add the environment variable **HADOOP_HOME** and set the value of the variable to **C\WinUtils**.
241241

242242
### Run a local Spark Scala application
243243

articles/hdinsight/spark/apache-spark-intellij-tool-debug-remotely-through-ssh.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ This article provides step-by-step guidance on how to use HDInsight Tools in [Az
2020

2121
* For Windows users: While you're running the local Spark Scala application on a Windows computer, you might get an exception, as explained in [SPARK-2356](https://issues.apache.org/jira/browse/SPARK-2356). The exception occurs because WinUtils.exe is missing on Windows.
2222

23-
To resolve this error, [download the executable](https://public-repo-1.hortonworks.com/hdp-win-alpha/winutils.exe) to a location such as **C:\WinUtils\bin**. Then, add the environment variable **HADOOP_HOME**, and set the value of the variable to **C:\WinUtils**.
23+
To resolve this error, download `https://public-repo-1.hortonworks.com/hdp-win-alpha/winutils.exe` to a location such as **C:\WinUtils\bin**. Then, add the environment variable **HADOOP_HOME**, and set the value of the variable to **C:\WinUtils**.
2424

2525
* [IntelliJ IDEA](https://www.jetbrains.com/idea/download/#section=windows) (The Community edition is free.).
2626

0 commit comments

Comments
 (0)