Skip to content

Commit 54f0545

Browse files
authored
Merge pull request #79546 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 5586451 + 786572c commit 54f0545

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

articles/active-directory/hybrid/how-to-connect-install-prerequisites.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ Before you install Azure AD Connect, there are a few things that you need.
4343
* It is recommended to [enable the Active Directory recycle bin](how-to-connect-sync-recycle-bin.md).
4444

4545
### Azure AD Connect server
46+
>[!IMPORTANT]
47+
>The Azure AD Connect server contains critical identity data and should be treated as a Tier 0 component as documented in [the Active Directory administrative tier model](https://docs.microsoft.com/windows-server/identity/securing-privileged-access/securing-privileged-access-reference-material#ADATM_BM)
48+
4649
* Azure AD Connect cannot be installed on Small Business Server or Windows Server Essentials before 2019 (Windows Server Essentials 2019 is supported). The server must be using Windows Server standard or better.
4750
* Installing Azure AD Connect on a Domain Controller is not recommended due to security practices and more restrictive settings that can prevent Azure AD Connect from installing correctly
4851
* The Azure AD Connect server must have a full GUI installed. It is **not supported** to install on server core.

articles/cognitive-services/cognitive-services-container-support.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ In addition, some containers are supported in Cognitive Services [**All-In-One o
7878
Azure Cognitive Services containers are publicly available through your Azure subscription, and Docker container images can be pulled from either the Microsoft Container Registry or Docker Hub. You can use the [docker pull](https://docs.docker.com/engine/reference/commandline/pull/) command to download a container image from the appropriate registry.
7979

8080
> [!IMPORTANT]
81-
> Currently, you must complete a sign-up process to access the following containers, in which you fill out and submit a questionnaire with questions about you, your company, and the use case for which you want to implement the containers. Once you're granted access and provided credentials, you can then pull the container images for the Face and Recognize Text containers from a private container registry hosted by Azure Container Registry.
81+
> Currently, you must complete a sign-up process to access the following containers, in which you fill out and submit a questionnaire with questions about you, your company, and the use case for which you want to implement the containers. Once you're granted access and provided credentials, you can then pull the container images from a private container registry hosted by Azure Container Registry.
8282
> * [Anomaly dectector](Anomaly-Detector/anomaly-detector-container-howto.md#request-access-to-the-container-registry)
8383
> * [Face](Face/face-how-to-install-containers.md)
8484
> * [Form Recognizer](form-recognizer/form-recognizer-container-howto.md#request-access-to-the-container-registry)
@@ -114,4 +114,4 @@ Install and explore the functionality provided by containers in Azure Cognitive
114114
* [Text Analytics containers](text-analytics/how-tos/text-analytics-how-to-install-containers.md)
115115

116116
<!--* [Personalizer containers](https://go.microsoft.com/fwlink/?linkid=2083928&clcid=0x409)
117-
-->
117+
-->

articles/hdinsight/hdinsight-component-versioning.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ The component versions associated with HDInsight cluster versions are listed in
4141
| Apache Storm | - | 1.1.0 | 1.0.1 | 0.10.0 | 0.10.0 | 0.9.3 |
4242
| Apache Mahout | - | 0.9.0+ | 0.9.0+ | 0.9.0+ | 0.9.0+ | 0.9.0 |
4343
| Apache Phoenix | 5 | 4.7.0 | 4.7.0 | 4.4.0 | 4.4.0 | 4.2.0 |
44-
| Apache Spark | 2.3.2 | 2.3.0, 2.2.0, 2.1.0 | 1.6.2, 2.0 | 1.6.0 | 1.5.2 | 1.3.1 (Windows only) |
44+
| Apache Spark | 2.3.1 | 2.3.0, 2.2.0, 2.1.0 | 1.6.2, 2.0 | 1.6.0 | 1.5.2 | 1.3.1 (Windows only) |
4545
| Apache Livy | 0.5 | 0.4, 0.4, 0.3 | 0.3 | 0.3 | 0.2 | - |
4646
| Apache Kafka | 1.1.1 | 1.1, 1.0 * (See Note below) | 0.10.0 | 0.9.0 | - | - |
4747
| Apache Ambari | 2.7.0 | 2.6.0 | 2.4.0 | 2.2.1 | 2.1.0 | - |

articles/hdinsight/hdinsight-release-notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ The official Apache versions of all HDInsight 4.0 components are given below. Th
3939
- Apache Pig 0.16.0
4040
- Apache Ranger 0.7.0
4141
- Apache Slider 0.92.0
42-
- Apache Spark 2.3.1
42+
- Apache Spark 2.3.2
4343
- Apache Sqoop 1.4.7
4444
- Apache TEZ 0.9.1
4545
- Apache Zeppelin 0.8.0

0 commit comments

Comments
 (0)