Resolving merge conflict

Author: ronmiab

AKS-Hybrid/aks-create-clusters-cli.md

@@ -4,7 +4,7 @@ description: Learn how to create Kubernetes clusters in Azure Stack HCI using Az
 ms.topic: how-to
 ms.custom: devx-track-azurecli
 author: sethmanheim
-ms.date: 02/05/2024
+ms.date: 09/24/2024
 ms.author: sethm 
 ms.lastreviewed: 01/25/2024
 ms.reviewer: guanghu
@@ -123,7 +123,7 @@ apiVersion: apps/v1
             "kubernetes.io/os": linux 
           containers: 
           - name: azure-vote-back 
-            image: mcr.microsoft.com/oss/bitnami/redis:6.0.8 
+            image: <path to image>/oss/bitnami/redis:6.0.8 
             env: 
             - name: ALLOW_EMPTY_PASSWORD 
               value: "yes" 
@@ -166,7 +166,7 @@ apiVersion: apps/v1
             "kubernetes.io/os": linux 
           containers: 
           - name: azure-vote-front 
-            image: mcr.microsoft.com/azuredocs/azure-vote-front:v1 
+            image: <path to image>/azure-vote-front:v1 
             resources: 
               requests: 
                 cpu: 100m 

AKS-Hybrid/deploy-linux-application.md

@@ -4,7 +4,7 @@ description: Learn how to deploy a multi-container Linux app to your Kubernetes
 author: sethmanheim
 ms.topic: how-to
 ms.custom: linux-related-content
-ms.date: 06/27/2024
+ms.date: 09/24/2024
 ms.author: sethm 
 ms.lastreviewed: 06/27/2022
 ms.reviewer: abha
@@ -103,7 +103,7 @@ spec:
         "beta.kubernetes.io/os": linux
       containers:
       - name: azure-vote-front
-        image: mcr.microsoft.com/azuredocs/azure-vote-front:v1
+        image: <path to image>/azure-vote-front:v1
         resources:
           requests:
             cpu: 100m

azure-stack/asdk/media/asdk-register/admin1.png

@@ -11,7 +11,7 @@ ms.date: 04/24/2023
 
 # Azure Stack HCI data collection
 
-[!INCLUDE [applies-to](../../includes/hci-applies-to-22h2-21h2.md)]
+[!INCLUDE [applies-to](../../includes/hci-applies-to-22h2.md)]
 
 This topic describes required data collected to keep Azure Stack HCI secure, up to date, and working as expected.
 

azure-stack/asdk/media/asdk-register/admin1sm.png

@@ -11,7 +11,7 @@ ms.date: 04/17/2023
 
 # Nested virtualization in Azure Stack HCI
 
-[!INCLUDE [applies-to](../../includes/hci-applies-to-22h2-21h2.md)]
+[!INCLUDE [applies-to](../../includes/hci-applies-to-22h2.md)]
 
 Nested virtualization is a feature that lets you run Hyper-V inside a Hyper-V virtual machine (VM). This allows you to maximize your hardware investments and gain flexibility in evaluation and testing scenarios.
 

azure-stack/hci/concepts/data-collection.md

@@ -10,7 +10,7 @@ ms.reviewer: JasonGerend
 
 # Network ATC overview
 
-[!INCLUDE [hci-applies-to-22h2-21h2](../../includes/hci-applies-to-22h2-21h2.md)]
+[!INCLUDE [hci-applies-to-22h2-21h2](../../includes/hci-applies-to-22h2.md)]
 
 Deployment and operation of Azure Stack HCI networking can be a complex and error-prone process. Due to the configuration flexibility provided with the host networking stack, there are many moving parts that can be easily misconfigured or overlooked. Staying up to date with the latest best practices is also a challenge as improvements are continuously made to the underlying technologies. Additionally, configuration consistency across HCI cluster nodes is important as it leads to a more reliable experience.
 

azure-stack/hci/concepts/nested-virtualization.md

@@ -10,7 +10,7 @@ ms.reviewer: dacuo
 
 # Network HUD overview
 
-[!INCLUDE [applies-to]( ../../includes/hci-applies-to-22h2-21h2.md)]
+[!INCLUDE [applies-to]( ../../includes/hci-applies-to-22h2.md)]
 
 Network HUD enables visibility across the network, simplifying operational network diagnostics. It performs real-time analysis of network issues and provides prescriptive alerts or auto-remediation of the issue when possible. These capabilities can increase stability and optimize network performance for workloads running on Azure Stack HCI.
 

azure-stack/hci/concepts/network-atc-overview.md

@@ -11,7 +11,7 @@ ms.date: 04/01/2024
 
 # Using Azure Stack HCI on a single server
 
-[!INCLUDE [applies-to](../../includes/hci-applies-to-22h2-21h2.md)]
+[!INCLUDE [applies-to](../../includes/hci-applies-to-22h2.md)]
 
 [!INCLUDE [warning-23h2](../../includes/hci-warning-single-server-22h2.md)]
 

azure-stack/hci/concepts/network-hud-overview.md

@@ -10,7 +10,7 @@ ms.reviewer: johnmar
 
 # Stretched clusters overview
 
-[!INCLUDE [applies-to](../../includes/hci-applies-to-22h2-21h2.md)]
+[!INCLUDE [applies-to](../../includes/hci-applies-to-22h2.md)]
 
 > [!IMPORTANT]
 > Stretched clusters are not yet supported in Azure Stack HCI version 23H2.