Skip to content

Commit d61c676

Browse files
committed
merge conflict
2 parents 2c666ee + d8f3056 commit d61c676

File tree

128 files changed

+382
-382
lines changed

Some content is hidden

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

128 files changed

+382
-382
lines changed

articles/machine-learning/azure-machine-learning-release-notes-cli-v2.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ ms.service: machine-learning
77
ms.subservice: core
88
ms.custom: engagement-fy23
99
ms.topic: reference
10-
ms.author: hancwang
11-
author: luigiw
12-
ms.reviewer: larryfr
10+
ms.author: larryfr
11+
author: Blackmist
12+
ms.reviewer: hancwang
1313
ms.date: 11/08/2022
1414
---
1515

articles/machine-learning/concept-customer-managed-keys.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ services: machine-learning
66
ms.service: machine-learning
77
ms.subservice: enterprise-readiness
88
ms.topic: conceptual
9-
ms.author: deeikele
10-
author: deeikele
11-
ms.reviewer: larryfr
9+
ms.author: larryfr
10+
author: Blackmist
11+
ms.reviewer: deeikele
1212
ms.date: 05/21/2024
1313
ms.custom: engagement-fy23, build-2024
1414
monikerRange: 'azureml-api-2 || azureml-api-1'

articles/machine-learning/concept-data-encryption.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ services: machine-learning
66
ms.service: machine-learning
77
ms.subservice: enterprise-readiness
88
ms.topic: conceptual
9-
ms.author: deeikele
10-
author: deeikele
11-
ms.reviewer: larryfr
9+
ms.author: larryfr
10+
author: Blackmist
11+
ms.reviewer: deeikele
1212
ms.date: 01/16/2024
1313
monikerRange: 'azureml-api-2 || azureml-api-1'
1414
---

articles/machine-learning/concept-enterprise-security.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ ms.service: machine-learning
77
ms.subservice: enterprise-readiness
88
ms.custom: build-2023
99
ms.topic: conceptual
10-
ms.author: aashishb
11-
author: aashishb
12-
ms.reviewer: larryfr
10+
ms.author: larryfr
11+
author: Blackmist
12+
ms.reviewer: aashishb
1313
ms.date: 09/13/2023
1414
---
1515

articles/machine-learning/concept-environments.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ services: machine-learning
66
ms.service: machine-learning
77
ms.subservice: core
88
ms.topic: conceptual
9-
author: ositanachi
10-
ms.author: osiotugo
11-
ms.reviewer: larryfr
9+
author: Blackmist
10+
ms.author: larryfr
11+
ms.reviewer: osiotugo
1212
ms.date: 01/03/2024
1313
---
1414

articles/machine-learning/concept-expressions.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ services: machine-learning
66
ms.service: machine-learning
77
ms.subservice: core
88
ms.topic: conceptual
9-
ms.author: zhanxia
10-
author: xiaoharper
11-
ms.reviewer: larryfr
9+
ms.author: larryfr
10+
author: Blackmist
11+
ms.reviewer: zhanxia
1212
ms.date: 07/26/2023
1313
ms.custom: cliv2, sdkv2
1414
---

articles/machine-learning/concept-hub-workspace.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ services: machine-learning
66
ms.service: machine-learning
77
ms.subservice: core
88
ms.topic: conceptual
9-
ms.author: deeikele
10-
author: deeikele
11-
ms.reviewer: larryfr
9+
ms.author: larryfr
10+
author: Blackmist
11+
ms.reviewer: deeikele
1212
ms.date: 05/09/2024
1313
monikerRange: 'azureml-api-2 || azureml-api-1'
1414
#Customer intent: As an IT administrator, I want to understand the purpose of a hub workspace for Azure Machine Learning.

articles/machine-learning/concept-machine-learning-registries-mlops.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ description: Learn about Azure Machine Learning registries and their role in sca
55
services: machine-learning
66
ms.service: machine-learning
77
ms.subservice: mlops
8-
ms.author: kritifaujdar
9-
author: fkriti
10-
ms.reviewer: larryfr
8+
ms.author: larryfr
9+
author: Blackmist
10+
ms.reviewer: kritifaujdar
1111
ms.date: 06/06/2024
1212
ms.topic: conceptual
1313
ms.custom: build-2023

articles/machine-learning/concept-secure-network-traffic-flow.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ services: machine-learning
66
ms.service: machine-learning
77
ms.subservice: enterprise-readiness
88
ms.topic: conceptual
9-
ms.author: meerakurup
10-
author: meerakurup
11-
ms.reviewer: larryfr
9+
ms.author: larryfr
10+
author: Blackmist
11+
ms.reviewer: meerakurup
1212
ms.date: 01/16/2024
1313
monikerRange: 'azureml-api-2 || azureml-api-1'
1414
---

articles/machine-learning/concept-soft-delete.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ services: machine-learning
66
ms.service: machine-learning
77
ms.subservice: core
88
ms.topic: conceptual
9-
ms.author: deeikele
10-
author: deeikele
11-
ms.reviewer: larryfr
9+
ms.author: larryfr
10+
author: Blackmist
11+
ms.reviewer: deeikele
1212
ms.date: 01/22/2024
1313
monikerRange: 'azureml-api-2 || azureml-api-1'
1414
#Customer intent: As an IT pro, understand how to enable data protection capabilities, to protect against accidental deletion.

0 commit comments

Comments
 (0)